Remove all use of busmouse(4), instead using wsmouse everywhere, even in

kernels that don't use wscons otherwise.  The X server released with 1.6
should be able to cope with this.
This commit is contained in:
bjh21 2004-03-13 18:25:25 +00:00
parent db7410bc83
commit 21d0142c1d
7 changed files with 76 additions and 44 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: EB7500ATX,v 1.2 2004/01/25 13:46:59 bjh21 Exp $
# $NetBSD: EB7500ATX,v 1.3 2004/03/13 18:25:25 bjh21 Exp $
#
# EB7500ATX kernel
#
@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "EB7500ATX-$Revision: 1.2 $"
#ident "EB7500ATX-$Revision: 1.3 $"
# estimated number of users
maxusers 32
@ -189,21 +189,28 @@ vidc0 at mainbus?
#vidcvideo0 at vidc? # wscons driver for VIDC
#wsdisplay* at vidcvideo? console ? # display itself
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
pms* at iomdkbc? slot ? # PS/2 mouse
wsmouse* at pms?
#rpckbd* at iomd? # based on old `kbd' driver
#wskbd* at rpckbd? # wskbd on RiscPC keyboard
#wsqms* at iomd? # ws quadmouse driver
#wsmouse* at wsqms? # wsmouse on ws quadmouse
#pseudo-device wsmux
pseudo-device wsmux
# The origional vidcconsole :
# vidcconsole kbd at IOMD
# vidcconsole PS2 mouse at IOMD
vidcconsole0 at vidc? # display + vt100 emulation
kbd* at iomd? # PS/2 keyboard for vidcconsole
#qms* at iomd? # RiscPC mouse for vidcconsole
opms* at iomd? # A7000/NC? mouse for vidcconsole
# generic VT console device
vt0 at vidc?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.35 2004/02/13 11:36:09 wiz Exp $
# $NetBSD: GENERIC,v 1.36 2004/03/13 18:25:25 bjh21 Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.35 $"
#ident "GENERIC-$Revision: 1.36 $"
# estimated number of users
maxusers 32
@ -198,21 +198,28 @@ vidc0 at mainbus?
#vidcvideo0 at vidc? # wscons driver for VIDC
#wsdisplay* at vidcvideo? console ? # display itself
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
pms* at iomdkbc? slot ? # PS/2 mouse
wsmouse* at pms?
#rpckbd* at iomd? # based on old `kbd' driver
#wskbd* at rpckbd? # wskbd on RiscPC keyboard
#wsqms* at iomd? # ws quadmouse driver
#wsmouse* at wsqms? # wsmouse on ws quadmouse
wsqms* at iomd? # ws quadmouse driver
wsmouse* at wsqms? # wsmouse on ws quadmouse
#pseudo-device wsmux
pseudo-device wsmux
# The origional vidcconsole :
# vidcconsole kbd at IOMD
# vidcconsole PS2 mouse at IOMD
vidcconsole0 at vidc? # display + vt100 emulation
kbd* at iomd? # PS/2 keyboard for vidcconsole
qms* at iomd? # RiscPC mouse for vidcconsole
opms* at iomd? # A7000/NC? mouse for vidcconsole
# generic VT console device
vt0 at vidc?

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.20 2004/02/13 11:36:09 wiz Exp $
# $NetBSD: INSTALL,v 1.21 2004/03/13 18:25:25 bjh21 Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "INSTALL-$Revision: 1.20 $"
#ident "INSTALL-$Revision: 1.21 $"
# estimated number of users
maxusers 32
@ -196,6 +196,18 @@ options FONT_SONY12x25 # looks like VT220 font
vidcvideo0 at vidc? # wscons driver for VIDC
wsdisplay* at vidcvideo? console ? # display itself
vidcvideo0 at vidc? # wscons driver for VIDC
wsdisplay* at vidcvideo? console ? # display itself
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
pms* at iomdkbc? slot ? # PS/2 mouse
wsmouse* at pms?
rpckbd* at iomd? # based on old `kbd' driver
wskbd* at rpckbd? # wskbd on RiscPC keyboard
@ -209,8 +221,6 @@ pseudo-device wsmux
# vidcconsole PS2 mouse at IOMD
#vidcconsole0 at vidc? # display + vt100 emulation
#kbd* at iomd? # PS/2 keyboard for vidcconsole
#qms* at iomd? # RiscPC mouse for vidcconsole
#opms* at iomd? # A7000/NC? mouse for vidcconsole
# generic VT console device
#vt0 at vidc?

View File

@ -1,4 +1,4 @@
# $NetBSD: LOWMEM_WSCONS,v 1.22 2004/02/13 11:36:09 wiz Exp $
# $NetBSD: LOWMEM_WSCONS,v 1.23 2004/03/13 18:25:25 bjh21 Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@ -173,21 +173,28 @@ options FONT_SONY12x25 # looks like VT220 font
vidcvideo0 at vidc? # wscons driver for VIDC
wsdisplay* at vidcvideo? console ? # display itself
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
pms* at iomdkbc? slot ? # PS/2 mouse
wsmouse* at pms?
rpckbd* at iomd? # based on old `kbd' driver
wskbd* at rpckbd? # wskbd on RiscPC keyboard
wsqms* at iomd? # ws quadmouse driver
wsmouse* at wsqms? # wsmouse on ws quadmouse
#pseudo-device wsmux
pseudo-device wsmux
# The origional vidcconsole :
# vidcconsole kbd at IOMD
# vidcconsole PS2 mouse at IOMD
#vidcconsole0 at vidc? # display + vt100 emulation
#kbd* at iomd? # PS/2 keyboard for vidcconsole
#qms* at iomd? # RiscPC mouse for vidcconsole
#opms* at iomd? # A7000/NC? mouse for vidcconsole
# generic VT console device
#vt0 at vidc?

View File

@ -1,4 +1,4 @@
# $NetBSD: NC,v 1.23 2004/02/13 11:36:09 wiz Exp $
# $NetBSD: NC,v 1.24 2004/03/13 18:25:25 bjh21 Exp $
#
# NC - with vidcconsole
#
@ -138,15 +138,20 @@ iomd0 at mainbus?
# system clock via IOMD
clock* at iomd?
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
pms* at iomdkbc? slot ? # PS/2 mouse
wsmouse* at pms?
pseudo-device wsmux
# kbd via IOMD
kbd* at iomd?
# quadrature mouse via IOMD
#qms* at iomd?
# PS2 mouse via IOMD
opms* at iomd?
# IIC bus device
iomdiic* at iomd?
iic0 at iomdiic?

View File

@ -1,4 +1,4 @@
# $NetBSD: NC_WSCONS,v 1.27 2004/03/13 17:59:00 bjh21 Exp $
# $NetBSD: NC_WSCONS,v 1.28 2004/03/13 18:25:25 bjh21 Exp $
#
# NC - with wscons
#
@ -140,9 +140,6 @@ iomd0 at mainbus?
# system clock via IOMD
clock* at iomd?
# quadrature mouse via IOMD
#qms* at iomd?
# IIC bus device
iomdiic* at iomd?
iic0 at iomdiic?
@ -177,12 +174,13 @@ wsdisplay* at vidcvideo? console ? # display itself
rpckbd* at iomd? # based on old `kbd' driver
wskbd* at rpckbd? # wskbd on RiscPC keyboard
#iomdkbc* at iomd?
#pckbd* at iomdkbc? slot ?
#options PCKBD_LAYOUT=KB_UK
pms* at iomdkbc? slot ?
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
pms* at iomdkbc? slot ? # PS/2 mouse
wsmouse* at pms?
#wsqms* at iomd? # ws quadmouse driver
@ -196,7 +194,6 @@ pseudo-device wsmux
# vidcconsole PS2 mouse at IOMD
#vidcconsole0 at vidc? # display + vt100 emulation
#kbd* at iomd? # PS/2 keyboard for vidcconsole
#opms* at iomd? # PS/2 mouse
# generic VT console device
#vt0 at vidc?

View File

@ -1,4 +1,4 @@
# $NetBSD: RPC_WSCONS,v 1.26 2004/03/13 17:59:00 bjh21 Exp $
# $NetBSD: RPC_WSCONS,v 1.27 2004/03/13 18:25:25 bjh21 Exp $
#
# RPC_WSCONS -- Full RiscPC config with wscons
#
@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.26 $"
#ident "GENERIC-$Revision: 1.27 $"
# estimated number of users
maxusers 32
@ -192,12 +192,13 @@ options FONT_SONY8x16 # not tested
vidcvideo0 at vidc? # wscons driver for VIDC
wsdisplay* at vidcvideo? console ? # display itself
iomdkbc* at iomd?
#pckbd* at iomdkbc? slot ?
#options PCKBD_LAYOUT=KB_UK
#pms* at iomdkbc? slot ?
iomdkbc* at iomd? # IOMD keyboard/mouse interface
#pckbd* at iomdkbc? slot ? # PS/2 keyboard
#options PCKBD_LAYOUT=KB_UK
#wskbd* at pckbd?
#pms* at iomdkbc? slot ? # PS/2 mouse
#wsmouse* at pms?
rpckbd* at iomd?
@ -213,8 +214,6 @@ pseudo-device wsmux
# vidcconsole PS2 mouse at IOMD
#vidcconsole0 at vidc? # display + vt100 emulation
#kbd* at iomd? # PS/2 keyboard for vidcconsole
#qms* at iomd? # RiscPC mouse for vidcconsole
#opms* at iomd? # A7000/NC? mouse for vidcconsole
# generic VT console device
#vt0 at vidc?