diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-03-28 14:39:46 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-03-28 14:39:46 +0000 |
| commit | 3617d031e9318e64b960604487a73072a73e7caf (patch) | |
| tree | c626799828740d63929f9efda2fd0e7d790ddd0f /sys/arch/macppc/conf | |
| parent | 241ad442be340c99e1c31698cf0b742f629056ed (diff) | |
Add WSDISPLAY_COMPAT_RAWKBD (commented), add missing mux pieces.
It is now possible to test wsmux with (recent) X. XF86Config changes
are necessary in InputDevice Section: Protocol -> standard, remove Device.
Diffstat (limited to 'sys/arch/macppc/conf')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index fbac73c2e53..c6d32099fe6 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.16 2002/03/25 15:08:58 lebel Exp $ +# $OpenBSD: GENERIC,v 1.17 2002/03/28 14:39:45 drahn Exp $ # # PPC GENERIC config file # @@ -18,6 +18,9 @@ option USBVERBOSE #option MACOBIOVERBOSE option ALTIVEC option APERTURE # in-kernel aperture driver for XFree86 +#option WSDISPLAY_COMPAT_RAWKBD + + option USER_PCICONF # user-space PCI configuration @@ -98,13 +101,16 @@ gpio* at gpio? # GPIO, PMU interrupt router. aed* at adb? # ADB Event Device akbd* at adb? # ADB keyboard -wskbd* at akbd? console ? +wskbd* at akbd? console ? mux 1 ams* at adb? # ADB mouse wsmouse* at ams? mux 0 #abtn* at adb? # ADB button? zsc* at macobio? zstty* at zsc? channel ? +#i2c* at macobio? +#tas* at i2c? + awacs* at macobio? # Apple audio device audio* at awacs? audio* at uaudio? @@ -154,7 +160,7 @@ uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter ucom* at uplcom? portno ? wsdisplay* at vgafb? -wskbd* at ukbd? console ? +wskbd* at ukbd? console ? mux 1 sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? |