Switch from pccons to wscons, so that USB keyboards have a chance of

working.  From Grant Beattie <grant@netbsd.org>, with changes by me.
This commit is contained in:
lukem 2002-06-24 16:14:13 +00:00
parent 603dca2ed2
commit e3b23eaafd
2 changed files with 84 additions and 28 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.197 2002/06/22 23:13:37 fvdl Exp $
# $NetBSD: INSTALL,v 1.198 2002/06/24 16:14:13 lukem Exp $
#
# INSTALL - Installation kernel.
#
@ -73,7 +73,7 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
#options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@ -155,6 +155,29 @@ options INET6 # IPv6
#options SCSIVERBOSE # human readable SCSI error messages
#options I2OVERBOSE # verbose I2O driver messages
#
# wscons options
#
# builtin terminal emulations
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
options WS_KERNEL_FG=WSCOL_WHITE
#options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
#options WSDISPLAY_COMPAT_USL # VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
#options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options VGA_CONSOLE_SCREENTYPE="\"80x24\""
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
#config netbsd root on sd0a type ffs
@ -221,7 +244,7 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console
pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -230,19 +253,19 @@ pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#options NORWEGIAN_KBD
# wscons
#pckbc0 at isa? # pc keyboard controller
#pckbd* at pckbc? # PC keyboard
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
#vga0 at isa?
#vga* at pci?
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
#wsdisplay* at vga? console ?
#wsdisplay* at pcdisplay? console ?
#wskbd* at pckbd? console ?
#wsmouse* at pms?
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
#wsmouse* at pms? mux 0
#pcppi0 at isa?
#sysbeep0 at pcppi?
pcppi0 at isa?
sysbeep0 at pcppi?
# Serial Devices
@ -720,3 +743,8 @@ pseudo-device pty 2 # pseudo-terminals (Sysinst needs two)
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL_LAPTOP,v 1.30 2002/05/18 23:49:40 jmcneill Exp $
# $NetBSD: INSTALL_LAPTOP,v 1.31 2002/06/24 16:14:14 lukem Exp $
#
# INSTALL - Installation kernel.
#
@ -73,7 +73,7 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
#options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@ -153,6 +153,29 @@ options INET6 # IPv6
#options PCMCIAVERBOSE # verbose PCMCIA configuration messages
#options SCSIVERBOSE # human readable SCSI error messages
#
# wscons options
#
# builtin terminal emulations
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
options WS_KERNEL_FG=WSCOL_WHITE
#options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
#options WSDISPLAY_COMPAT_USL # VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
#options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options VGA_CONSOLE_SCREENTYPE="\"80x24\""
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
#config netbsd root on ? type nfs
@ -229,7 +252,7 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# Console Devices
# ISA console
pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
@ -238,19 +261,19 @@ pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
#options NORWEGIAN_KBD
# wscons
#pckbc0 at isa? # pc keyboard controller
#pckbd* at pckbc? # PC keyboard
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
#vga0 at isa?
#vga* at pci?
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
#wsdisplay* at vga? console ?
#wsdisplay* at pcdisplay? console ?
#wskbd* at pckbd? console ?
#wsmouse* at pms?
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
#wsmouse* at pms? mux 0
#pcppi0 at isa?
#sysbeep0 at pcppi?
pcppi0 at isa?
sysbeep0 at pcppi?
# Serial Devices
@ -493,3 +516,8 @@ pseudo-device pty 2 # pseudo-terminals (Sysinst needs two)
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont