diff options
Diffstat (limited to 'sys/arch/alpha/conf')
| -rw-r--r-- | sys/arch/alpha/conf/ALATAR | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/ALPHA | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/AXPPCI33 | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/BUNNY | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC.PROF | 10 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/JURA | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/LOKI | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 12 |
10 files changed, 45 insertions, 41 deletions
diff --git a/sys/arch/alpha/conf/ALATAR b/sys/arch/alpha/conf/ALATAR index 58e6c13def6..1a550eab114 100644 --- a/sys/arch/alpha/conf/ALATAR +++ b/sys/arch/alpha/conf/ALATAR @@ -1,4 +1,4 @@ -# $OpenBSD: ALATAR,v 1.3 1997/07/08 21:26:26 deraadt Exp $ +# $OpenBSD: ALATAR,v 1.4 1999/01/08 03:16:15 niklas Exp $ # # AXPpci 33 kernel. Enough to get booted, etc., but not much more. @@ -75,8 +75,8 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA index 1817b5a3331..a6aab533394 100644 --- a/sys/arch/alpha/conf/ALPHA +++ b/sys/arch/alpha/conf/ALPHA @@ -1,4 +1,4 @@ -# $OpenBSD: ALPHA,v 1.12 1997/09/26 16:49:20 kstailey Exp $ +# $OpenBSD: ALPHA,v 1.13 1999/01/08 03:16:15 niklas Exp $ # $NetBSD: ALPHA,v 1.30 1996/12/03 17:25:27 cgd Exp $ # # Alpha kernel with all the options you'd want, and more. @@ -147,9 +147,9 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/AXPPCI33 b/sys/arch/alpha/conf/AXPPCI33 index 4641843ede8..d6bf9d710b0 100644 --- a/sys/arch/alpha/conf/AXPPCI33 +++ b/sys/arch/alpha/conf/AXPPCI33 @@ -1,4 +1,4 @@ -# $OpenBSD: AXPPCI33,v 1.4 1998/10/04 23:39:48 niklas Exp $ +# $OpenBSD: AXPPCI33,v 1.5 1999/01/08 03:16:15 niklas Exp $ # # Generic Alpha AXPPCI33 (NoName) kernel. # Enough to get booted, etc., but not much more. @@ -122,9 +122,9 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY index 77c28320329..bea8e452f4c 100644 --- a/sys/arch/alpha/conf/BUNNY +++ b/sys/arch/alpha/conf/BUNNY @@ -1,4 +1,4 @@ -# $OpenBSD: BUNNY,v 1.10 1997/07/08 21:26:28 deraadt Exp $ +# $OpenBSD: BUNNY,v 1.11 1999/01/08 03:16:15 niklas Exp $ # $NetBSD: BUNNY,v 1.12 1996/11/25 04:16:15 cgd Exp $ # # Kernel for bunnahabhain.pdl.cs.cmu.edu. @@ -75,9 +75,9 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 237a13a0566..35827a30483 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.36 1998/12/28 03:50:37 jason Exp $ +# $OpenBSD: GENERIC,v 1.37 1999/01/08 03:16:15 niklas Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -101,9 +101,11 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +#pcppi* at isa? # PC prog. periph. interface +#spkr0 at pcppi? +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/GENERIC.PROF b/sys/arch/alpha/conf/GENERIC.PROF index a1fadb206c9..fcdd2c499f8 100644 --- a/sys/arch/alpha/conf/GENERIC.PROF +++ b/sys/arch/alpha/conf/GENERIC.PROF @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC.PROF,v 1.4 1997/07/08 21:26:29 deraadt Exp $ +# $OpenBSD: GENERIC.PROF,v 1.5 1999/01/08 03:16:16 niklas Exp $ # $NetBSD: GENERIC.PROF,v 1.10 1996/12/03 17:25:31 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -120,9 +120,11 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +#pcppi* at isa? # PC prog. periph. interface +#spkr0 at pcppi? +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA index 650648c5b97..e47b4d09a4c 100644 --- a/sys/arch/alpha/conf/JURA +++ b/sys/arch/alpha/conf/JURA @@ -1,4 +1,4 @@ -# $OpenBSD: JURA,v 1.9 1997/07/08 21:26:29 deraadt Exp $ +# $OpenBSD: JURA,v 1.10 1999/01/08 03:16:16 niklas Exp $ # $NetBSD: JURA,v 1.11 1996/11/25 04:16:18 cgd Exp $ # # Kernel for jura.pdl.cs.cmu.edu. @@ -53,9 +53,9 @@ jcombo* at ibus? # the VLSI combo chip isa* at jcombo? mcclock0 at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com0 at isa? port 0x3f8 irq 4 # standard serial ports com1 at isa? port 0x2f8 irq 3 lpt0 at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/LOKI b/sys/arch/alpha/conf/LOKI index e5b983e0bcf..3064f050a87 100644 --- a/sys/arch/alpha/conf/LOKI +++ b/sys/arch/alpha/conf/LOKI @@ -1,4 +1,4 @@ -# $OpenBSD: LOKI,v 1.5 1998/10/06 23:53:26 kstailey Exp $ +# $OpenBSD: LOKI,v 1.6 1999/01/08 03:16:16 niklas Exp $ # # LOKI, an Alpha AXPPCI33 (NoName) kernel. # @@ -91,9 +91,9 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -pms* at pcppi? # PS/2-style mouse (aux port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 48475ed2b4b..efb8c807ec1 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.22 1998/12/28 03:50:37 jason Exp $ +# $OpenBSD: RAMDISK,v 1.23 1999/01/08 03:16:16 niklas Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -140,9 +140,9 @@ isa* at sio? # ISA devices mcclock* at isa? port 0x70 -pcppi* at isa? # PC prog. periph. interface -pckbd* at pcppi? # PC keyboard (kbd port) -#pms* at pcppi? # PS/2-style mouse (aux port) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +#pms* at pckbc? # PS/2-style mouse (aux port) com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 #lpt* at isa? port 0x3bc irq 7 # standard parallel port diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 8f9ad066435..c6d2009aa33 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.23 1998/09/22 20:43:33 jason Exp $ +# $OpenBSD: files.alpha,v 1.24 1999/01/08 03:16:16 niklas Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -143,16 +143,16 @@ major { wd = 0 } file arch/alpha/isa/isa_machdep.c isa file arch/alpha/pci/pciide_machdep.c pci -device pcppi { } -attach pcppi at isa -file arch/alpha/isa/pcppi.c pcppi +device pckbc { } +attach pckbc at isa +file arch/alpha/isa/pckbc.c pckbc device pckbd -attach pckbd at pcppi +attach pckbd at pckbc file arch/alpha/isa/pckbd.c pckbd device pms -attach pms at pcppi +attach pms at pckbc file arch/alpha/isa/pms.c pms # National Semiconductor DS8390/WD83C690-based boards |