Removed inclusion of pio.h and cpufunc.h (cpufunc.h is included from
systm.h). Merged functionality of pio.h into cpufunc.h. Cleaned up some related code.
This commit is contained in:
dg
parent
cd1fdc31d4
commit
f40d319a86
@ -39,7 +39,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
|
||||
* $Id: pmap.c,v 1.34 1994/09/02 04:12:06 davidg Exp $
|
||||
* $Id: pmap.c,v 1.35 1994/09/04 04:11:57 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -94,7 +94,6 @@
|
||||
#include <vm/vm_kern.h>
|
||||
#include <vm/vm_page.h>
|
||||
|
||||
#include <i386/include/cpufunc.h>
|
||||
#include <i386/include/cputypes.h>
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: support.s,v 1.16 1994/09/04 10:24:22 davidg Exp $
|
||||
* $Id: support.s,v 1.17 1994/09/12 11:38:09 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "assym.s" /* system definitions */
|
||||
@ -59,19 +59,6 @@ ENTRY(__divsi3)
|
||||
/*
|
||||
* I/O bus instructions via C
|
||||
*/
|
||||
ENTRY(inb) /* val = inb(port) */
|
||||
movl 4(%esp),%edx
|
||||
subl %eax,%eax
|
||||
inb %dx,%al
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(inw) /* val = inw(port) */
|
||||
movl 4(%esp),%edx
|
||||
subl %eax,%eax
|
||||
inw %dx,%ax
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(insb) /* insb(port, addr, cnt) */
|
||||
pushl %edi
|
||||
@ -121,20 +108,6 @@ ENTRY(rtcin) /* rtcin(val) */
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outb) /* outb(port, val) */
|
||||
movl 4(%esp),%edx
|
||||
movl 8(%esp),%eax
|
||||
outb %al,%dx
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outw) /* outw(port, val) */
|
||||
movl 4(%esp),%edx
|
||||
movl 8(%esp),%eax
|
||||
outw %ax,%dx
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outsb) /* outsb(port, addr, cnt) */
|
||||
pushl %esi
|
||||
movl 8(%esp),%edx
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: support.s,v 1.16 1994/09/04 10:24:22 davidg Exp $
|
||||
* $Id: support.s,v 1.17 1994/09/12 11:38:09 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "assym.s" /* system definitions */
|
||||
@ -59,19 +59,6 @@ ENTRY(__divsi3)
|
||||
/*
|
||||
* I/O bus instructions via C
|
||||
*/
|
||||
ENTRY(inb) /* val = inb(port) */
|
||||
movl 4(%esp),%edx
|
||||
subl %eax,%eax
|
||||
inb %dx,%al
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(inw) /* val = inw(port) */
|
||||
movl 4(%esp),%edx
|
||||
subl %eax,%eax
|
||||
inw %dx,%ax
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(insb) /* insb(port, addr, cnt) */
|
||||
pushl %edi
|
||||
@ -121,20 +108,6 @@ ENTRY(rtcin) /* rtcin(val) */
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outb) /* outb(port, val) */
|
||||
movl 4(%esp),%edx
|
||||
movl 8(%esp),%eax
|
||||
outb %al,%dx
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outw) /* outw(port, val) */
|
||||
movl 4(%esp),%edx
|
||||
movl 8(%esp),%eax
|
||||
outw %ax,%dx
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outsb) /* outsb(port, addr, cnt) */
|
||||
pushl %esi
|
||||
movl 8(%esp),%edx
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: cpufunc.h,v 1.22 1994/09/15 17:55:47 paul Exp $
|
||||
* $Id: cpufunc.h,v 1.23 1994/09/16 11:22:33 jkh Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -46,10 +46,53 @@
|
||||
|
||||
#include <machine/spl.h>
|
||||
|
||||
#include <machine/pio.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
static inline u_char
|
||||
inb(u_short port)
|
||||
{
|
||||
u_char data;
|
||||
|
||||
__asm __volatile("inb %1,%0" : "=a" (data) : "d" (port));
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline u_short
|
||||
inw(u_short port)
|
||||
{
|
||||
u_short data;
|
||||
|
||||
__asm __volatile("inw %1,%0" : "=a" (data) : "d" (port));
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline u_long
|
||||
inl(u_short port)
|
||||
{
|
||||
u_long data;
|
||||
|
||||
__asm __volatile("inl %1,%0" : "=a" (data) : "d" (port));
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline void
|
||||
outb(u_short port, u_char val)
|
||||
{
|
||||
__asm __volatile("outb %0,%1" : :"a" (val), "d" (port));
|
||||
}
|
||||
|
||||
static inline void
|
||||
outw(u_short port, u_short val)
|
||||
{
|
||||
__asm __volatile("outw %0,%1" : :"a" (val), "d" (port));
|
||||
}
|
||||
|
||||
static inline void
|
||||
outl(u_short port, u_long val)
|
||||
{
|
||||
__asm __volatile("outl %0,%1" : :"a" (val), "d" (port));
|
||||
}
|
||||
|
||||
static inline int bdb(void)
|
||||
{
|
||||
extern int bdb_exists;
|
||||
@ -145,9 +188,6 @@ extern void DELAY(int);
|
||||
|
||||
void setidt __P((int, void (*)(), int, int));
|
||||
extern u_long kvtop(void *);
|
||||
#ifndef outw /* If not inline defined */
|
||||
extern void outw(int /*u_short*/, int /*u_short*/); /* XXX inline!*/
|
||||
#endif
|
||||
extern void outsb(int /*u_short*/, void *, size_t);
|
||||
extern void outsw(int /*u_short*/, void *, size_t);
|
||||
extern void insw(int /*u_short*/, void *, size_t);
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)icu.h 5.6 (Berkeley) 5/9/91
|
||||
* $Id: icu.h,v 1.2 1993/10/16 13:45:51 rgrimes Exp $
|
||||
* $Id: icu.h,v 1.3 1994/04/02 07:00:40 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -52,17 +52,17 @@
|
||||
*/
|
||||
extern unsigned imen; /* interrupt mask enable */
|
||||
|
||||
#define INTREN(s) (imen &= ~(s), SET_ICUS())
|
||||
#define INTRDIS(s) (imen |= (s), SET_ICUS())
|
||||
#define INTREN(s) {imen &= ~(s); SET_ICUS()}
|
||||
#define INTRDIS(s) {imen |= (s); SET_ICUS()}
|
||||
#define INTRMASK(msk,s) (msk |= (s))
|
||||
#if 0
|
||||
#define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8))
|
||||
#define SET_ICUS() {outb(IO_ICU1 + 1, imen); outb(IU_ICU2 + 1, imen >> 8);}
|
||||
#else
|
||||
/*
|
||||
* XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to
|
||||
* include isa.h, while too many things include icu.h.
|
||||
*/
|
||||
#define SET_ICUS() (outb(0x21, imen), outb(0xa1, imen >> 8))
|
||||
#define SET_ICUS() {outb(0x21, imen); outb(0xa1, imen >> 8);}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
|
||||
* and a variety of similar clones.
|
||||
*
|
||||
* $Id: if_ed.c,v 1.46 1994/08/22 08:21:51 davidg Exp $
|
||||
* $Id: if_ed.c,v 1.47 1994/09/07 06:11:29 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "ed.h"
|
||||
@ -54,8 +54,6 @@
|
||||
#include <i386/isa/icu.h>
|
||||
#include <i386/isa/if_edreg.h>
|
||||
|
||||
#include <i386/include/pio.h>
|
||||
|
||||
/* For backwards compatibility */
|
||||
#ifndef IFF_ALTPHYS
|
||||
#define IFF_ALTPHYS IFF_LINK0
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
|
||||
* $Id: if_ep.c,v 1.11 1994/08/08 13:33:14 davidg Exp $
|
||||
* $Id: if_ep.c,v 1.12 1994/09/03 18:10:43 ats Exp $
|
||||
*/
|
||||
|
||||
#include "ep.h"
|
||||
@ -66,8 +66,6 @@
|
||||
#include <net/bpfdesc.h>
|
||||
#endif
|
||||
|
||||
#include <machine/pio.h>
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#include <i386/isa/icu.h>
|
||||
|
||||
@ -25,11 +25,9 @@
|
||||
* the rights to redistribute these changes.
|
||||
*
|
||||
* from: Mach, Revision 2.2 92/04/04 11:35:57 rpd
|
||||
* $Id: io.c,v 1.5 1994/06/15 19:09:14 jkh Exp $
|
||||
* $Id: io.c,v 1.6 1994/06/16 03:53:29 adam Exp $
|
||||
*/
|
||||
|
||||
#include <i386/include/pio.h>
|
||||
|
||||
#define K_RDWR 0x60 /* keyboard data & cmds (read/write) */
|
||||
#define K_STATUS 0x64 /* keyboard status */
|
||||
#define K_CMD 0x64 /* keybd ctlr command (write-only) */
|
||||
|
||||
@ -25,11 +25,9 @@
|
||||
* the rights to redistribute these changes.
|
||||
*
|
||||
* from: Mach, Revision 2.2 92/04/04 11:35:57 rpd
|
||||
* $Id: io.c,v 1.5 1994/06/15 19:09:14 jkh Exp $
|
||||
* $Id: io.c,v 1.6 1994/06/16 03:53:29 adam Exp $
|
||||
*/
|
||||
|
||||
#include <i386/include/pio.h>
|
||||
|
||||
#define K_RDWR 0x60 /* keyboard data & cmds (read/write) */
|
||||
#define K_STATUS 0x64 /* keyboard status */
|
||||
#define K_CMD 0x64 /* keybd ctlr command (write-only) */
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
*
|
||||
* commenced: Sun Sep 27 18:14:01 PDT 1992
|
||||
*
|
||||
* $Id: aha1742.c,v 1.20 1994/08/27 16:14:17 davidg Exp $
|
||||
* $Id: aha1742.c,v 1.21 1994/08/31 23:32:32 se Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -29,7 +29,6 @@
|
||||
#include <sys/buf.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/user.h>
|
||||
#include <i386/include/pio.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#endif /*KERNEL */
|
||||
#include <scsi/scsi_all.h>
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
|
||||
* $Id: pmap.c,v 1.34 1994/09/02 04:12:06 davidg Exp $
|
||||
* $Id: pmap.c,v 1.35 1994/09/04 04:11:57 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -94,7 +94,6 @@
|
||||
#include <vm/vm_kern.h>
|
||||
#include <vm/vm_page.h>
|
||||
|
||||
#include <i386/include/cpufunc.h>
|
||||
#include <i386/include/cputypes.h>
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: support.s,v 1.16 1994/09/04 10:24:22 davidg Exp $
|
||||
* $Id: support.s,v 1.17 1994/09/12 11:38:09 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "assym.s" /* system definitions */
|
||||
@ -59,19 +59,6 @@ ENTRY(__divsi3)
|
||||
/*
|
||||
* I/O bus instructions via C
|
||||
*/
|
||||
ENTRY(inb) /* val = inb(port) */
|
||||
movl 4(%esp),%edx
|
||||
subl %eax,%eax
|
||||
inb %dx,%al
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(inw) /* val = inw(port) */
|
||||
movl 4(%esp),%edx
|
||||
subl %eax,%eax
|
||||
inw %dx,%ax
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(insb) /* insb(port, addr, cnt) */
|
||||
pushl %edi
|
||||
@ -121,20 +108,6 @@ ENTRY(rtcin) /* rtcin(val) */
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outb) /* outb(port, val) */
|
||||
movl 4(%esp),%edx
|
||||
movl 8(%esp),%eax
|
||||
outb %al,%dx
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outw) /* outw(port, val) */
|
||||
movl 4(%esp),%edx
|
||||
movl 8(%esp),%eax
|
||||
outw %ax,%dx
|
||||
NOP
|
||||
ret
|
||||
|
||||
ENTRY(outsb) /* outsb(port, addr, cnt) */
|
||||
pushl %esi
|
||||
movl 8(%esp),%edx
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: cpufunc.h,v 1.22 1994/09/15 17:55:47 paul Exp $
|
||||
* $Id: cpufunc.h,v 1.23 1994/09/16 11:22:33 jkh Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -46,10 +46,53 @@
|
||||
|
||||
#include <machine/spl.h>
|
||||
|
||||
#include <machine/pio.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
static inline u_char
|
||||
inb(u_short port)
|
||||
{
|
||||
u_char data;
|
||||
|
||||
__asm __volatile("inb %1,%0" : "=a" (data) : "d" (port));
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline u_short
|
||||
inw(u_short port)
|
||||
{
|
||||
u_short data;
|
||||
|
||||
__asm __volatile("inw %1,%0" : "=a" (data) : "d" (port));
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline u_long
|
||||
inl(u_short port)
|
||||
{
|
||||
u_long data;
|
||||
|
||||
__asm __volatile("inl %1,%0" : "=a" (data) : "d" (port));
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline void
|
||||
outb(u_short port, u_char val)
|
||||
{
|
||||
__asm __volatile("outb %0,%1" : :"a" (val), "d" (port));
|
||||
}
|
||||
|
||||
static inline void
|
||||
outw(u_short port, u_short val)
|
||||
{
|
||||
__asm __volatile("outw %0,%1" : :"a" (val), "d" (port));
|
||||
}
|
||||
|
||||
static inline void
|
||||
outl(u_short port, u_long val)
|
||||
{
|
||||
__asm __volatile("outl %0,%1" : :"a" (val), "d" (port));
|
||||
}
|
||||
|
||||
static inline int bdb(void)
|
||||
{
|
||||
extern int bdb_exists;
|
||||
@ -145,9 +188,6 @@ extern void DELAY(int);
|
||||
|
||||
void setidt __P((int, void (*)(), int, int));
|
||||
extern u_long kvtop(void *);
|
||||
#ifndef outw /* If not inline defined */
|
||||
extern void outw(int /*u_short*/, int /*u_short*/); /* XXX inline!*/
|
||||
#endif
|
||||
extern void outsb(int /*u_short*/, void *, size_t);
|
||||
extern void outsw(int /*u_short*/, void *, size_t);
|
||||
extern void insw(int /*u_short*/, void *, size_t);
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
*
|
||||
* commenced: Sun Sep 27 18:14:01 PDT 1992
|
||||
*
|
||||
* $Id: aha1742.c,v 1.20 1994/08/27 16:14:17 davidg Exp $
|
||||
* $Id: aha1742.c,v 1.21 1994/08/31 23:32:32 se Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -29,7 +29,6 @@
|
||||
#include <sys/buf.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/user.h>
|
||||
#include <i386/include/pio.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#endif /*KERNEL */
|
||||
#include <scsi/scsi_all.h>
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: elink.c,v 1.1 1994/05/25 20:06:40 ats Exp $
|
||||
* $Id: elink.c,v 1.1 1994/08/24 22:32:41 ats Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -35,7 +35,6 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <machine/pio.h>
|
||||
#include <i386/isa/elink.h>
|
||||
|
||||
/*
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
* 06/03/93 v0.1 Alpha release Hopefully the last re-write. Many bugs fixed,
|
||||
* many remain.
|
||||
*
|
||||
* $Id: ft.c,v 1.9 1994/08/21 20:16:14 paul Exp $
|
||||
* $Id: ft.c,v 1.10 1994/08/23 07:52:12 paul Exp $
|
||||
*/
|
||||
|
||||
#include "ft.h"
|
||||
@ -64,7 +64,6 @@
|
||||
#include <sys/buf.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/ftape.h>
|
||||
#include <machine/pio.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#include <i386/isa/fdreg.h>
|
||||
#include <i386/isa/fdc.h>
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)icu.h 5.6 (Berkeley) 5/9/91
|
||||
* $Id: icu.h,v 1.2 1993/10/16 13:45:51 rgrimes Exp $
|
||||
* $Id: icu.h,v 1.3 1994/04/02 07:00:40 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -52,17 +52,17 @@
|
||||
*/
|
||||
extern unsigned imen; /* interrupt mask enable */
|
||||
|
||||
#define INTREN(s) (imen &= ~(s), SET_ICUS())
|
||||
#define INTRDIS(s) (imen |= (s), SET_ICUS())
|
||||
#define INTREN(s) {imen &= ~(s); SET_ICUS()}
|
||||
#define INTRDIS(s) {imen |= (s); SET_ICUS()}
|
||||
#define INTRMASK(msk,s) (msk |= (s))
|
||||
#if 0
|
||||
#define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8))
|
||||
#define SET_ICUS() {outb(IO_ICU1 + 1, imen); outb(IU_ICU2 + 1, imen >> 8);}
|
||||
#else
|
||||
/*
|
||||
* XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to
|
||||
* include isa.h, while too many things include icu.h.
|
||||
*/
|
||||
#define SET_ICUS() (outb(0x21, imen), outb(0xa1, imen >> 8))
|
||||
#define SET_ICUS() {outb(0x21, imen); outb(0xa1, imen >> 8);}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
|
||||
* and a variety of similar clones.
|
||||
*
|
||||
* $Id: if_ed.c,v 1.46 1994/08/22 08:21:51 davidg Exp $
|
||||
* $Id: if_ed.c,v 1.47 1994/09/07 06:11:29 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "ed.h"
|
||||
@ -54,8 +54,6 @@
|
||||
#include <i386/isa/icu.h>
|
||||
#include <i386/isa/if_edreg.h>
|
||||
|
||||
#include <i386/include/pio.h>
|
||||
|
||||
/* For backwards compatibility */
|
||||
#ifndef IFF_ALTPHYS
|
||||
#define IFF_ALTPHYS IFF_LINK0
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
|
||||
* $Id: if_ep.c,v 1.11 1994/08/08 13:33:14 davidg Exp $
|
||||
* $Id: if_ep.c,v 1.12 1994/09/03 18:10:43 ats Exp $
|
||||
*/
|
||||
|
||||
#include "ep.h"
|
||||
@ -66,8 +66,6 @@
|
||||
#include <net/bpfdesc.h>
|
||||
#endif
|
||||
|
||||
#include <machine/pio.h>
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#include <i386/isa/icu.h>
|
||||
|
||||
@ -77,8 +77,6 @@
|
||||
#include "i386/isa/icu.h"
|
||||
#include "i386/isa/if_zereg.h"
|
||||
|
||||
#include "i386/include/pio.h"
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
||||
* ----------------------------------------------------------------------------
|
||||
*
|
||||
* $Id: pas.c,v 1.2 1994/09/11 20:28:50 phk Exp $
|
||||
* $Id: pas.c,v 1.3 1994/09/13 06:44:39 phk Exp $
|
||||
*
|
||||
* This is a driver for the one particular kind of the "ProAudioSpectrum"
|
||||
* card from MediaVision. To find out if your card is supported, you can
|
||||
@ -74,7 +74,6 @@
|
||||
#include "systm.h"
|
||||
#include "types.h"
|
||||
#include "buf.h"
|
||||
#include "machine/cpufunc.h"
|
||||
#include "i386/isa/isa_device.h"
|
||||
#include <scsi/scsi_all.h>
|
||||
#include <scsi/scsiconf.h>
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: pcaudio.c,v 1.3 1994/05/20 12:24:15 sos Exp $
|
||||
* $Id: pcaudio.c,v 1.6 1994/08/22 11:11:05 sos Exp $
|
||||
*/
|
||||
|
||||
#include "pca.h"
|
||||
@ -34,8 +34,6 @@
|
||||
#include <sys/systm.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <machine/cpufunc.h>
|
||||
#include <machine/pio.h>
|
||||
#include <machine/pcaudioio.h>
|
||||
#include <i386/isa/isa.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
|
||||
@ -61,7 +61,6 @@
|
||||
#include <vnode.h>
|
||||
|
||||
#include <i386/include/mouse.h>
|
||||
#include <i386/include/pio.h> /* Julian's fast IO macros */
|
||||
#include <i386/isa/isa_device.h>
|
||||
|
||||
#ifdef 0
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* today: Fri Jun 2 17:21:03 EST 1994
|
||||
* added 24F support ++sg
|
||||
*
|
||||
* $Id: ultra14f.c,v 1.23 1994/08/27 16:14:22 davidg Exp $
|
||||
* $Id: ultra14f.c,v 1.24 1994/08/28 16:08:51 bde Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -39,7 +39,6 @@
|
||||
#include <sys/proc.h>
|
||||
#include <sys/user.h>
|
||||
|
||||
#include <i386/include/pio.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#endif /*KERNEL */
|
||||
#include <scsi/scsi_all.h>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
* the original CMU copyright notice.
|
||||
*
|
||||
* Version 1.3, Thu Nov 11 12:09:13 MSK 1993
|
||||
* $Id: wt.c,v 1.9 1994/08/20 03:48:43 davidg Exp $
|
||||
* $Id: wt.c,v 1.10 1994/08/23 07:52:29 paul Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -62,7 +62,6 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mtio.h>
|
||||
#include <vm/vm_param.h>
|
||||
#include <i386/include/pio.h>
|
||||
#include <i386/isa/isa_device.h>
|
||||
#include <i386/isa/wtreg.h>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** $Id: ncr.c,v 2.0.0.23 94/09/15 21:35:44 wolf Exp $
|
||||
** $Id: ncr.c,v 1.3 1994/09/16 00:22:29 se Exp $
|
||||
**
|
||||
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
|
||||
**
|
||||
@ -1247,33 +1247,6 @@ static int ncr_intr (int dev);
|
||||
#else /* !__NetBSD__ */
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
#ifdef ANCIENT
|
||||
/*
|
||||
** Doch das ist alles nur geklaut ..
|
||||
** aus: 386bsd:/sys/i386/include/pio.h
|
||||
**
|
||||
** Mach Operating System
|
||||
** Copyright (c) 1990 Carnegie-Mellon University
|
||||
** All rights reserved. The CMU software License Agreement specifies
|
||||
** the terms and conditions for use and redistribution.
|
||||
*/
|
||||
|
||||
#undef inb
|
||||
#define inb(port) \
|
||||
({ unsigned char data; \
|
||||
__asm __volatile("inb %1, %0": "=a" (data): "d" ((u_short)(port))); \
|
||||
data; })
|
||||
|
||||
#undef outb
|
||||
#define outb(port, data) \
|
||||
{__asm __volatile("outb %0, %1"::"a" ((u_char)(data)), "d" ((u_short)(port)));}
|
||||
|
||||
#define disable_intr() \
|
||||
{__asm __volatile("cli");}
|
||||
|
||||
#define enable_intr() \
|
||||
{__asm __volatile("sti");}
|
||||
#endif /* ANCIENT */
|
||||
|
||||
/*------------------------------------------------------------------
|
||||
**
|
||||
@ -1323,7 +1296,7 @@ static u_long getirr (void)
|
||||
|
||||
|
||||
static char ident[] =
|
||||
"\n$Id: ncr.c,v 2.0.0.23 94/09/15 21:35:44 wolf Exp $\n";
|
||||
"\n$Id: ncr.c,v 1.3 1994/09/16 00:22:29 se Exp $\n";
|
||||
|
||||
u_long ncr_version = NCR_VERSION
|
||||
+ (u_long) sizeof (struct ncb)
|
||||
@ -3379,7 +3352,7 @@ static int ncr_attach (pcici_t config_id)
|
||||
ncr_name (np));
|
||||
DELAY (1000000);
|
||||
#endif
|
||||
printf ("%s scanning for targets 0..%d ($Revision: 2.0.0.23 $)\n",
|
||||
printf ("%s scanning for targets 0..%d ($Revision: 1.3 $)\n",
|
||||
ncr_name (np), MAX_TARGET-1);
|
||||
|
||||
/*
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** $Id: ncr.c,v 2.0.0.23 94/09/15 21:35:44 wolf Exp $
|
||||
** $Id: ncr.c,v 1.3 1994/09/16 00:22:29 se Exp $
|
||||
**
|
||||
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
|
||||
**
|
||||
@ -1247,33 +1247,6 @@ static int ncr_intr (int dev);
|
||||
#else /* !__NetBSD__ */
|
||||
|
||||
#include <i386/isa/isa.h>
|
||||
#ifdef ANCIENT
|
||||
/*
|
||||
** Doch das ist alles nur geklaut ..
|
||||
** aus: 386bsd:/sys/i386/include/pio.h
|
||||
**
|
||||
** Mach Operating System
|
||||
** Copyright (c) 1990 Carnegie-Mellon University
|
||||
** All rights reserved. The CMU software License Agreement specifies
|
||||
** the terms and conditions for use and redistribution.
|
||||
*/
|
||||
|
||||
#undef inb
|
||||
#define inb(port) \
|
||||
({ unsigned char data; \
|
||||
__asm __volatile("inb %1, %0": "=a" (data): "d" ((u_short)(port))); \
|
||||
data; })
|
||||
|
||||
#undef outb
|
||||
#define outb(port, data) \
|
||||
{__asm __volatile("outb %0, %1"::"a" ((u_char)(data)), "d" ((u_short)(port)));}
|
||||
|
||||
#define disable_intr() \
|
||||
{__asm __volatile("cli");}
|
||||
|
||||
#define enable_intr() \
|
||||
{__asm __volatile("sti");}
|
||||
#endif /* ANCIENT */
|
||||
|
||||
/*------------------------------------------------------------------
|
||||
**
|
||||
@ -1323,7 +1296,7 @@ static u_long getirr (void)
|
||||
|
||||
|
||||
static char ident[] =
|
||||
"\n$Id: ncr.c,v 2.0.0.23 94/09/15 21:35:44 wolf Exp $\n";
|
||||
"\n$Id: ncr.c,v 1.3 1994/09/16 00:22:29 se Exp $\n";
|
||||
|
||||
u_long ncr_version = NCR_VERSION
|
||||
+ (u_long) sizeof (struct ncb)
|
||||
@ -3379,7 +3352,7 @@ static int ncr_attach (pcici_t config_id)
|
||||
ncr_name (np));
|
||||
DELAY (1000000);
|
||||
#endif
|
||||
printf ("%s scanning for targets 0..%d ($Revision: 2.0.0.23 $)\n",
|
||||
printf ("%s scanning for targets 0..%d ($Revision: 1.3 $)\n",
|
||||
ncr_name (np), MAX_TARGET-1);
|
||||
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user