diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2005-04-22 11:59:12 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-04-22 11:59:12 +0000 |
commit | 45d66f70648de09cb68227f7bc36df4b3c144a6d (patch) | |
tree | 6b3e10f3990bb400d467dcadb21cf4f03b7aa764 /sys/arch/hp300/conf | |
parent | 2859385583ab340f0cbf668de9bb48e8553d3e76 (diff) |
Driver for the Apollo Domain keyboard and mouse, for the HP 9000/4xx series.
Claims the console keyboard if a keyboard is detected at boot time,
otherwise HIL is preferred (but due to wsmux both can be used simultaneously).
Diffstat (limited to 'sys/arch/hp300/conf')
-rw-r--r-- | sys/arch/hp300/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/arch/hp300/conf/RAMDISK | 8 | ||||
-rw-r--r-- | sys/arch/hp300/conf/files.hp300 | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index c9a8e7e7e00..d7938c0c2b6 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.37 2005/02/27 22:21:47 miod Exp $ +# $OpenBSD: GENERIC,v 1.38 2005/04/22 11:59:11 miod Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -63,7 +63,9 @@ hilid* at hil? # ID module frodo0 at intio? # 8250-like serial ports found on Frodo ASIC -#dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor +dnkbd0 at frodo? # Domain keyboard flavor +wskbd* at dnkbd? mux 1 +wsmouse* at dnkbd? mux 0 apci* at frodo? # tty flavor # Davinci framebuffer diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK index 9c436d4015b..d1d1cb48727 100644 --- a/sys/arch/hp300/conf/RAMDISK +++ b/sys/arch/hp300/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.23 2005/02/27 22:21:47 miod Exp $ +# $OpenBSD: RAMDISK,v 1.24 2005/04/22 11:59:11 miod Exp $ # # Ram disk kernel. # @@ -74,8 +74,10 @@ wskbd* at hilkbd? mux 1 frodo0 at intio? # 8250-like serial ports found on Frodo ASIC -#dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor -apci* at frodo? # tty flavor +dnkbd0 at frodo? # Domain keyboard flavor +wskbd* at dnkbd? mux 1 +#wsmouse* at dnkbd? mux 0 +apci* at frodo? # tty flavor # Davinci framebuffer dvbox* at intio? diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300 index 2ab51c9af7d..deee9683ae5 100644 --- a/sys/arch/hp300/conf/files.hp300 +++ b/sys/arch/hp300/conf/files.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: files.hp300,v 1.27 2005/03/08 20:00:23 tdeval Exp $ +# $OpenBSD: files.hp300,v 1.28 2005/04/22 11:59:11 miod Exp $ # $NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $ # # hp300-specific configuration info @@ -49,14 +49,16 @@ attach frodo at intio file arch/hp300/dev/frodo.c frodo # Apollo Keyboard and mouse -device dnkbd +device dnkbd: wskbddev, wsmousedev attach dnkbd at frodo file arch/hp300/dev/dnkbd.c dnkbd needs-flag +file arch/hp300/dev/dnkbdmap.c dnkbd # Apollo APCI 8250-like UARTs device apci attach apci at frodo file arch/hp300/dev/apci.c apci needs-flag +file arch/hp300/dev/apci_subr.c apci | dnkbd # "workstation console" routines include "dev/rasops/files.rasops" |