d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the non-MD machine/dvcfg.h and machine/physio_proc.h to a common

Browse Source 
MI area before they proliferate more.
This commit is contained in:
peter 2004-03-13 19:46:27 +00:00
parent b73a90b15c
commit 19c6ef7d3a
16 changed files with 22 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sys/amd64/include/dvcfg.h
View File

@ -1,65 +0,0 @@
/* $FreeBSD$ */
/* $NetBSD$ */
/*
* [NetBSD for NEC PC98 series]
* Copyright (c) 1996 NetBSD/pc98 porting staff.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* Copyright (c) 1996 Naofumi HONDA. All rights reserved.
*/
#ifndef _AMD64_DVCFG_H_
#define _AMD64_DVCFG_H_
typedef void *dvcfg_hw_t;
struct dvcfg_hwsel {
int cfg_max;
dvcfg_hw_t *cfg_sel;
};
#define DVCFG_MAJOR(dvcfg) (((u_int)(dvcfg)) >> 16)
#define DVCFG_MINOR(dvcfg) (((u_int)(dvcfg)) & 0xffff)
#define DVCFG_MKCFG(major, minor) ((((u_int)(major)) << 16) | ((minor) & 0xffff))
#define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t))
static __inline dvcfg_hw_t dvcfg_hw(struct dvcfg_hwsel *, u_int);
static __inline dvcfg_hw_t
dvcfg_hw(selp, num)
struct dvcfg_hwsel *selp;
u_int num;
{
return ((num >= selp->cfg_max) ? 0 : selp->cfg_sel[num]);
}
#define DVCFG_HW(SELP, NUM) dvcfg_hw((SELP), (NUM))
#endif /* _AMD64_DVCFG_H_ */

57
sys/amd64/include/physio_proc.h
View File

@ -1,57 +0,0 @@
/* $FreeBSD$ */
/* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */
/* $NetBSD$ */
/*
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* NetBSD/pc98 porting staff. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _AMD64_PHYSIO_PROC_H_
#define _AMD64_PHYSIO_PROC_H_
#include <sys/queue.h>
struct buf;
struct physio_proc {
};
static __inline struct physio_proc *physio_proc_enter(struct buf *);
static __inline void physio_proc_leave(struct physio_proc *);
static __inline struct physio_proc *
physio_proc_enter(bp)
struct buf *bp;
{
return NULL;
}
static __inline void
physio_proc_leave(pp)
struct physio_proc *pp;
{
}
#endif /* _AMD64_PHYSIO_PROC_H_ */

6
sys/compat/netbsd/dvcfg.h
View File

@ -32,8 +32,8 @@
* Copyright (c) 1996 Naofumi HONDA. All rights reserved.
*/
#ifndef _I386_DVCFG_H_
#define _I386_DVCFG_H_
#ifndef _COMPAT_NETBSD_DVCFG_H_
#define _COMPAT_NETBSD_DVCFG_H_
typedef void *dvcfg_hw_t;
@ -62,4 +62,4 @@ dvcfg_hw(selp, num)
}
#define DVCFG_HW(SELP, NUM) dvcfg_hw((SELP), (NUM))
#endif /* _I386_DVCFG_H_ */
#endif /* _COMPAT_NETBSD_DVCFG_H_ */

6
sys/compat/netbsd/physio_proc.h
View File

@ -30,8 +30,8 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _I386_PHYSIO_PROC_H_
#define _I386_PHYSIO_PROC_H_
#ifndef _COMPAT_NETBSD_PHYSIO_PROC_H_
#define _COMPAT_NETBSD_PHYSIO_PROC_H_
#include <sys/queue.h>
struct buf;
@ -54,4 +54,4 @@ physio_proc_leave(pp)
struct physio_proc *pp;
{
}
#endif /* _I386_PHYSIO_PROC_H_ */
#endif /* _COMPAT_NETBSD_PHYSIO_PROC_H_ */

4
sys/dev/ct/bshw_machdep.c
View File

@ -78,8 +78,8 @@ __FBSDID("$FreeBSD$");
#include <machine/clock.h>
#include <machine/md_var.h>
#include <machine/dvcfg.h>
#include <machine/physio_proc.h>
#include <compat/netbsd/dvcfg.h>
#include <compat/netbsd/physio_proc.h>
#include <cam/scsi/scsi_low.h>

4
sys/dev/ct/ct.c
View File

@ -76,8 +76,8 @@ __FBSDID("$FreeBSD$");
#ifdef __FreeBSD__
#include <machine/bus.h>
#include <machine/dvcfg.h>
#include <machine/physio_proc.h>
#include <compat/netbsd/dvcfg.h>
#include <compat/netbsd/physio_proc.h>
#include <cam/scsi/scsi_low.h>

4
sys/dev/ct/ct_isa.c
View File

@ -81,8 +81,8 @@ __FBSDID("$FreeBSD$");
#include <pc98/pc98/pc98.h>
#include <isa/isavar.h>
#include <machine/dvcfg.h>
#include <machine/physio_proc.h>
#include <compat/netbsd/dvcfg.h>
#include <compat/netbsd/physio_proc.h>
#include <cam/scsi/scsi_low.h>

4
sys/dev/ncv/ncr53c500.c
View File

@ -79,8 +79,8 @@ __FBSDID("$FreeBSD$");
#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/dvcfg.h>
#include <machine/physio_proc.h>
#include <compat/netbsd/dvcfg.h>
#include <compat/netbsd/physio_proc.h>
#include <cam/scsi/scsi_low.h>

2
sys/dev/ncv/ncr53c500_pccard.c
View File

@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/bus_pio.h>
#include <machine/dvcfg.h>
#include <compat/netbsd/dvcfg.h>
#include <sys/device_port.h>

2
sys/dev/ncv/ncr53c500hw.h
View File

@ -36,7 +36,7 @@
#ifndef __NCR53C500HW_H_
#define __NCR53C500HW_H_
#include <machine/dvcfg.h>
#include <compat/netbsd/dvcfg.h>
#define NCV_HOSTID 7
#define NCV_NTARGETS 8

4
sys/dev/nsp/nsp.c
View File

@ -79,8 +79,8 @@ __FBSDID("$FreeBSD$");
#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/dvcfg.h>
#include <machine/physio_proc.h>
#include <compat/netbsd/dvcfg.h>
#include <compat/netbsd/physio_proc.h>
#include <cam/scsi/scsi_low.h>
#include <dev/nsp/nspreg.h>

2
sys/dev/nsp/nsp_pccard.c
View File

@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <machine/bus.h>
#include <machine/dvcfg.h>
#include <compat/netbsd/dvcfg.h>
#include <sys/device_port.h>

4
sys/dev/stg/tmc18c30.c
View File

@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/dvcfg.h>
#include <machine/physio_proc.h>
#include <compat/netbsd/dvcfg.h>
#include <compat/netbsd/physio_proc.h>
#include <cam/scsi/scsi_low.h>
#include <dev/stg/tmc18c30reg.h>

2
sys/dev/stg/tmc18c30_pccard.c
View File

@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/bus_pio.h>
#include <machine/dvcfg.h>
#include <compat/netbsd/dvcfg.h>
#include <sys/device_port.h>

65
sys/i386/include/dvcfg.h
View File

@ -1,65 +0,0 @@
/* $FreeBSD$ */
/* $NetBSD$ */
/*
* [NetBSD for NEC PC98 series]
* Copyright (c) 1996 NetBSD/pc98 porting staff.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
* Copyright (c) 1996 Naofumi HONDA. All rights reserved.
*/
#ifndef _I386_DVCFG_H_
#define _I386_DVCFG_H_
typedef void *dvcfg_hw_t;
struct dvcfg_hwsel {
int cfg_max;
dvcfg_hw_t *cfg_sel;
};
#define DVCFG_MAJOR(dvcfg) (((u_int)(dvcfg)) >> 16)
#define DVCFG_MINOR(dvcfg) (((u_int)(dvcfg)) & 0xffff)
#define DVCFG_MKCFG(major, minor) ((((u_int)(major)) << 16) | ((minor) & 0xffff))
#define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t))
static __inline dvcfg_hw_t dvcfg_hw(struct dvcfg_hwsel *, u_int);
static __inline dvcfg_hw_t
dvcfg_hw(selp, num)
struct dvcfg_hwsel *selp;
u_int num;
{
return ((num >= selp->cfg_max) ? 0 : selp->cfg_sel[num]);
}
#define DVCFG_HW(SELP, NUM) dvcfg_hw((SELP), (NUM))
#endif /* _I386_DVCFG_H_ */

57
sys/i386/include/physio_proc.h
View File

@ -1,57 +0,0 @@
/* $FreeBSD$ */
/* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */
/* $NetBSD$ */
/*
* [NetBSD for NEC PC-98 series]
* Copyright (c) 1998
* NetBSD/pc98 porting staff. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _I386_PHYSIO_PROC_H_
#define _I386_PHYSIO_PROC_H_
#include <sys/queue.h>
struct buf;
struct physio_proc {
};
static __inline struct physio_proc *physio_proc_enter(struct buf *);
static __inline void physio_proc_leave(struct physio_proc *);
static __inline struct physio_proc *
physio_proc_enter(bp)
struct buf *bp;
{
return NULL;
}
static __inline void
physio_proc_leave(pp)
struct physio_proc *pp;
{
}
#endif /* _I386_PHYSIO_PROC_H_ */