diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/socppc/conf/GENERIC | 14 | ||||
| -rw-r--r-- | sys/arch/socppc/conf/files.socppc | 8 | ||||
| -rw-r--r-- | sys/arch/socppc/socppc/conf.c | 21 |
3 files changed, 35 insertions, 8 deletions
diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC index 11471059320..b15a912ced1 100644 --- a/sys/arch/socppc/conf/GENERIC +++ b/sys/arch/socppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 2009/02/18 12:29:18 jasper Exp $ +# $OpenBSD: GENERIC,v 1.11 2009/05/31 20:43:44 maja Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -56,6 +56,12 @@ uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs umass* at uhub? # USB Mass Storage devices scsibus* at umass? +uhidev* at uhub? # Human Interface Devices +ums* at uhidev? # USB mouse +wsmouse* at ums? mux 0 +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +uhid* at uhidev? # USB generic HID support axe* at uhub? # ASIX Electronics AX88172 USB Ethernet mos* at uhub? # MOSCHIP CS730/7830 10/100 Ethernet uath* at uhub? # Atheros AR5005UR/AR5005UX @@ -64,6 +70,9 @@ rum* at uhub? # Ralink RT2501USB/RT2601USB run* at uhub? # Ralink RT2700U/RT2800U/RT3000U zyd* at uhub? # Zydas ZD1211 +udl* at uhub? +wsdisplay* at udl? + sd* at scsibus? # On-board TSEC @@ -75,3 +84,6 @@ eephy* at mii? # Marvell 88E1000 series PHY rlphy* at mii? # RealTek 8139 internal PHYs gentbi* at mii? # Generic 1000BASE-X ten-bit PHY ukphy* at mii? # Generic unknown PHY + +# mouse & keyboard multiplexor pseudo-devices +pseudo-device wsmux 2 diff --git a/sys/arch/socppc/conf/files.socppc b/sys/arch/socppc/conf/files.socppc index e79ce8fad28..84cf7aa8fc5 100644 --- a/sys/arch/socppc/conf/files.socppc +++ b/sys/arch/socppc/conf/files.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.socppc,v 1.3 2008/05/25 16:23:58 kettenis Exp $ +# $OpenBSD: files.socppc,v 1.4 2009/05/31 20:43:44 maja Exp $ # # macppc-specific configuration info @@ -83,6 +83,12 @@ file arch/socppc/dev/socpcic.c include "../../../dev/atapiscsi/files.atapiscsi" include "../../../dev/ata/files.ata" +# WSCONS bits for wskbd.h +# +include "dev/wscons/files.wscons" +include "dev/wsfont/files.wsfont" +include "dev/rasops/files.rasops" + # # Machine-independent USB drivers # diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c index 63a93c9f7d2..9b588feabf5 100644 --- a/sys/arch/socppc/socppc/conf.c +++ b/sys/arch/socppc/socppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2009/01/25 17:30:49 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2009/05/31 20:43:44 maja Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -81,10 +81,16 @@ int nblkdev = sizeof bdevsw / sizeof bdevsw[0]; #include "com.h" cdev_decl(com); +#include "wsdisplay.h" +#include "wskbd.h" +#include "wsmouse.h" + #include "bpfilter.h" #include "tun.h" +#include "wsmux.h" + #ifdef USER_PCICONF #include "pci.h" cdev_decl(pci); @@ -102,6 +108,7 @@ cdev_decl(pci); #include "ksyms.h" #include "usb.h" +#include "uhid.h" struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -166,15 +173,17 @@ struct cdevsw cdevsw[] = { cdev_notdef(), /* 59 */ cdev_notdef(), /* 60 */ cdev_usb_init(NUSB,usb), /* 61: USB controller */ - cdev_notdef(), /* 62 */ + cdev_usbdev_init(NUHID,uhid), /* 62: USB generic HID */ cdev_notdef(), /* 63 */ cdev_notdef(), /* 64 */ cdev_notdef(), /* 65 */ cdev_notdef(), /* 66 */ - cdev_notdef(), /* 67 */ - cdev_notdef(), /* 68 */ - cdev_notdef(), /* 69 */ - cdev_notdef(), /* 70 */ + cdev_wsdisplay_init(NWSDISPLAY, /* 67: frame buffers, etc. */ + wsdisplay), + cdev_mouse_init(NWSKBD, wskbd), /* 68: keyboards */ + cdev_mouse_init(NWSMOUSE, /* 69: mice */ + wsmouse), + cdev_mouse_init(NWSMUX, wsmux), /* 70: ws multiplexor */ #ifdef USER_PCICONF cdev_pci_init(NPCI,pci), /* 71: PCI user */ #else |