diff options
author | Joel Sing <jsing@cvs.openbsd.org> | 2007-10-18 18:59:30 +0000 |
---|---|---|
committer | Joel Sing <jsing@cvs.openbsd.org> | 2007-10-18 18:59:30 +0000 |
commit | 5f5dc8ee699cb0137500182a10819458f4cb5e99 (patch) | |
tree | 709134f01ee741ec277a3d257f202cb70647cb3f /sys/arch/sgi/conf | |
parent | 9f9e1d5e8291af36c167d1fd8a9637ac27f82268 (diff) |
Add support for the Moosehead PS/2 controller as found on SGI O2 workstations.
ok miod@ deraadt@
Diffstat (limited to 'sys/arch/sgi/conf')
-rw-r--r-- | sys/arch/sgi/conf/GENERIC | 9 | ||||
-rw-r--r-- | sys/arch/sgi/conf/files.sgi | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC index 5dff9cc042b..27ec1c40fee 100644 --- a/sys/arch/sgi/conf/GENERIC +++ b/sys/arch/sgi/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2007/07/17 21:28:48 jakemsr Exp $ +# $OpenBSD: GENERIC,v 1.22 2007/10/18 18:59:29 jsing Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -51,6 +51,7 @@ macebus0 at mainbus0 # MACE controller localbus. clock0 at macebus0 mec0 at macebus0 sys 0x18 base 0x00280000 irq 4 mavb0 at macebus0 sys 0x18 base 0x00300000 irq 7 +mkbc0 at macebus0 disable sys 0x18 base 0x00320000 irq 6 com0 at macebus0 sys 0x18 base 0x00390000 irq 5 com1 at macebus0 sys 0x18 base 0x00398000 irq 5 @@ -110,6 +111,12 @@ audio* at emu? #wsdisplay* at vga? #wskbd* at ukbd? mux 1 +#### Keyboard and Mouse +pckbd* at mkbc? +pms* at mkbc? +wskbd* at pckbd? console ? +wsmouse* at pms? mux 0 + #### SCSI Bus devices sd* at scsibus? st* at scsibus? diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index 0b9fd20ada1..100cc12e849 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.13 2007/06/21 20:17:12 miod Exp $ +# $OpenBSD: files.sgi,v 1.14 2007/10/18 18:59:29 jsing Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -103,6 +103,12 @@ device mavb: audio attach mavb at macebus file arch/sgi/dev/mavb.c mavb +# MACE PS/2 Controller +include "dev/pckbc/files.pckbc" +device mkbc: pckbcslot +attach mkbc at macebus +file arch/sgi/dev/mkbc.c mkbc + # Raster operations include "dev/rasops/files.rasops" include "dev/wsfont/files.wsfont" |