From b7c6c315eab1ff7f9e3c74af334968acb53de4e7 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 15 Apr 1998 21:19:21 +0000 Subject: [PATCH] convert to new wscons (pcppi->pckbc, pms->psm, wscons->wsdisplay) --- sys/arch/alpha/conf/ALPHA | 23 +++++++++++++++-------- sys/arch/alpha/conf/BABYLON | 16 ++++++++-------- sys/arch/alpha/conf/BISHOP | 21 +++++++++++++-------- sys/arch/alpha/conf/BUNNY | 17 +++++++++++------ sys/arch/alpha/conf/GENERIC | 23 +++++++++++++++-------- sys/arch/alpha/conf/INSTALL | 17 +++++++++++------ sys/arch/alpha/conf/INSTALL-FLOPPY | 16 ++++++++++------ sys/arch/alpha/conf/JURA | 8 ++++---- sys/arch/alpha/conf/NOSY | 7 +++++-- 9 files changed, 92 insertions(+), 56 deletions(-) diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA index d3002ff72a72..81e879d3f0d7 100644 --- a/sys/arch/alpha/conf/ALPHA +++ b/sys/arch/alpha/conf/ALPHA @@ -1,4 +1,4 @@ -# $NetBSD: ALPHA,v 1.70 1998/04/15 00:47:21 mjacob Exp $ +# $NetBSD: ALPHA,v 1.71 1998/04/15 21:19:21 drochner Exp $ # # Alpha kernel with all the options you'd want, and more. @@ -106,6 +106,9 @@ options PCIVERBOSE # recognize "unknown" PCI devices options TCVERBOSE # recognize "unknown" TC devices options UCONSOLE # users can use TIOCCONS (for xconsole) +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? #config netbsd root on sd0 type ffs #config netbsd root on ? type nfs @@ -188,9 +191,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) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +psm* at pckbc? # PS/2-style mouse (aux port) +pcppi* at isa? # PC prog. periph. interface +spkr0 at pcppi? # IBM BASIC emulation com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 ep* at isa? port ? irq ? # 3COM 3c509 Ethernet @@ -248,10 +253,12 @@ sd* at atapibus? drive ? # ATAPI disk devices cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments -#wscons* at cfb? -wscons* at vga? -#wscons* at sfb? -wscons* at tga? +#wsdisplay* at cfb? +wsdisplay* at vga? +#wsdisplay* at sfb? +wsdisplay* at tga? +wskbd* at pckbd? +wsmouse* at psm? pseudo-device bpfilter 16 pseudo-device ccd 4 diff --git a/sys/arch/alpha/conf/BABYLON b/sys/arch/alpha/conf/BABYLON index 62785d580d55..995c6205217c 100644 --- a/sys/arch/alpha/conf/BABYLON +++ b/sys/arch/alpha/conf/BABYLON @@ -1,4 +1,4 @@ -# $NetBSD: BABYLON,v 1.4 1998/03/25 02:16:41 ross Exp $ +# $NetBSD: BABYLON,v 1.5 1998/04/15 21:19:21 drochner Exp $ # # BABYLON -- babylon.netbsd.org, the new mail server # @@ -187,9 +187,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) +#psm* 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 #ep* at isa? port ? irq ? # 3COM 3c509 Ethernet @@ -252,10 +252,10 @@ uk* at scsibus? target ? lun ? # SCSI unknown #cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments -#wscons* at cfb? -#wscons* at vga? -#wscons* at sfb? -#wscons* at tga? +#wsdisplay* at cfb? +#wsdisplay* at vga? +#wsdisplay* at sfb? +#wsdisplay* at tga? pseudo-device bpfilter 16 pseudo-device ccd 4 diff --git a/sys/arch/alpha/conf/BISHOP b/sys/arch/alpha/conf/BISHOP index ccae6b03afeb..c13a37dcc0c4 100644 --- a/sys/arch/alpha/conf/BISHOP +++ b/sys/arch/alpha/conf/BISHOP @@ -1,4 +1,4 @@ -# $NetBSD: BISHOP,v 1.1 1998/03/26 03:00:36 thorpej Exp $ +# $NetBSD: BISHOP,v 1.2 1998/04/15 21:19:21 drochner Exp $ # # Kernel for bishop.nas.nasa.gov and ripley.nas.nasa.gov (AlphaStation 500 # and AlphaStation 600, respectively). @@ -67,6 +67,9 @@ options PCIVERBOSE # recognize "unknown" PCI devices options SCSIVERBOSE # Verbose SCSI errors options UCONSOLE # users can use TIOCCONS (for xconsole) +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? mainbus0 at root @@ -104,9 +107,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) +psm* 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 @@ -142,10 +145,12 @@ st* at scsibus? target ? lun ? # SCSI tape drives fd* at fdc? drive ? # Workstation Console attachments -#wscons* at cfb? -wscons* at vga? -#wscons* at sfb? -wscons* at tga? +#wsdisplay* at cfb? +wsdisplay* at vga? +#wsdisplay* at sfb? +wsdisplay* at tga? +wskbd* at pckbd? +wsmouse* at psm? pseudo-device bpfilter 16 pseudo-device ccd 4 diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY index e146ea0202b2..16b966c2b529 100644 --- a/sys/arch/alpha/conf/BUNNY +++ b/sys/arch/alpha/conf/BUNNY @@ -1,4 +1,4 @@ -# $NetBSD: BUNNY,v 1.19 1997/11/30 23:19:00 mjacob Exp $ +# $NetBSD: BUNNY,v 1.20 1998/04/15 21:19:21 drochner Exp $ # # Kernel for bunnahabhain.pdl.cs.cmu.edu. # @@ -54,6 +54,9 @@ options LKM options PCIVERBOSE # recognize "unknown" PCI devices options UCONSOLE # users can use TIOCCONS (for xconsole) +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? mainbus0 at root @@ -77,9 +80,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) +psm* 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 @@ -95,8 +98,10 @@ st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? # Workstation Console attachments -wscons* at vga? -wscons* at tga? +wsdisplay* at vga? +wsdisplay* at tga? +wskbd* at pckbd? +wsmouse* at psm? pseudo-device bpfilter 16 pseudo-device loop diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index a1984d0a9bad..2764a50b523b 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.80 1998/04/15 00:47:21 mjacob Exp $ +# $NetBSD: GENERIC,v 1.81 1998/04/15 21:19:22 drochner Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -79,6 +79,9 @@ options UCONSOLE # users can use TIOCCONS (for xconsole) # in case we have NFS root. options NFS_BOOT_DHCP # superset of BOOTP +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? #config netbsd root on sd0 type ffs #config netbsd root on ? type nfs @@ -161,9 +164,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) +pckbc* at isa? # PC keyboard controller +pckbd* at pckbc? # PC keyboard (kbd port) +psm* at pckbc? # PS/2-style mouse (aux port) +pcppi* at isa? # PC prog. periph. interface +spkr0 at pcppi? # IBM BASIC emulation com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 ep* at isa? port ? irq ? # 3COM 3c509 Ethernet @@ -216,10 +221,12 @@ sd* at atapibus? drive ? # ATAPI disk devices cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments -#wscons* at cfb? -wscons* at vga? -#wscons* at sfb? -wscons* at tga? +#wsdisplay* at cfb? +wsdisplay* at vga? +#wsdisplay* at sfb? +wsdisplay* at tga? +wskbd* at pckbd? +wsmouse* at psm? pseudo-device bpfilter 16 pseudo-device ccd 4 diff --git a/sys/arch/alpha/conf/INSTALL b/sys/arch/alpha/conf/INSTALL index 7bd09eb65986..0fa025e971cf 100644 --- a/sys/arch/alpha/conf/INSTALL +++ b/sys/arch/alpha/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.9 1998/03/25 02:16:42 ross Exp $ +# $NetBSD: INSTALL,v 1.10 1998/04/15 21:19:22 drochner Exp $ # # Alpha INSTALL kernel. @@ -57,6 +57,9 @@ options UCONSOLE # users can use TIOCCONS (for xconsole) # in case we have NFS root. options NFS_BOOT_DHCP # superset of BOOTP +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? mainbus0 at root @@ -122,9 +125,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) +psm* 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 ep* at isa? port ? irq ? # 3COM 3c509 Ethernet @@ -164,8 +167,10 @@ sd* at atapibus? drive ? # ATAPI disk devices cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments -wscons* at vga? -wscons* at tga? +wsdisplay* at vga? +wsdisplay* at tga? +wskbd* at pckbd? +wsmouse* at psm? pseudo-device loop 1 pseudo-device md 1 diff --git a/sys/arch/alpha/conf/INSTALL-FLOPPY b/sys/arch/alpha/conf/INSTALL-FLOPPY index d6fd384ecc64..eeadbba67af6 100644 --- a/sys/arch/alpha/conf/INSTALL-FLOPPY +++ b/sys/arch/alpha/conf/INSTALL-FLOPPY @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL-FLOPPY,v 1.3 1998/03/25 02:16:42 ross Exp $ +# $NetBSD: INSTALL-FLOPPY,v 1.4 1998/04/15 21:19:22 drochner Exp $ # # Alpha INSTALL kernel. @@ -44,6 +44,9 @@ options COMPAT_43 #options COMPAT_12 #options COMPAT_13 +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? mainbus0 at root @@ -109,9 +112,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) +#psm* 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 ep* at isa? port ? irq ? # 3COM 3c509 Ethernet @@ -150,8 +153,9 @@ sd* at atapibus? drive ? # ATAPI disk devices cd* at atapibus? drive ? # ATAPI CD-ROM devices # Workstation Console attachments -wscons* at vga? -wscons* at tga? +wsdisplay* at vga? +wsdisplay* at tga? +wskbd* at pckbd? pseudo-device loop 1 pseudo-device md 1 diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA index 73f0e20d10d3..134910790ec4 100644 --- a/sys/arch/alpha/conf/JURA +++ b/sys/arch/alpha/conf/JURA @@ -1,4 +1,4 @@ -# $NetBSD: JURA,v 1.19 1998/03/25 02:16:42 ross Exp $ +# $NetBSD: JURA,v 1.20 1998/04/15 21:19:22 drochner Exp $ # # Kernel for jura.pdl.cs.cmu.edu. # @@ -56,9 +56,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) +psm* 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/NOSY b/sys/arch/alpha/conf/NOSY index 56884b77f95a..5dd60e05448a 100644 --- a/sys/arch/alpha/conf/NOSY +++ b/sys/arch/alpha/conf/NOSY @@ -1,4 +1,4 @@ -# $NetBSD: NOSY,v 1.24 1998/03/26 02:58:48 thorpej Exp $ +# $NetBSD: NOSY,v 1.25 1998/04/15 21:19:22 drochner Exp $ # # Kernel for nostromo.nas.nasa.gov. # @@ -58,6 +58,9 @@ options COMPAT_13 # Disable kernel security. options INSECURE +# WS console uses SUN terminal emulation +options WSEMUL_SUN + config netbsd root on ? type ? mainbus0 at root @@ -97,7 +100,7 @@ cd* at scsibus? target ? lun ? ch* at scsibus? target ? lun ? # Workstation Console attachments -wscons* at sfb? +wsdisplay* at sfb? pseudo-device bpfilter 16 pseudo-device loop