diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-08-24 13:20:34 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-08-24 13:20:34 +0000 |
| commit | 1e99a647b416c2fa87684901599d04c13b54e62b (patch) | |
| tree | 9880a0b2c21ceaaf1f212e4487507684157db63d | |
| parent | According the code `nfsbootdevname' is always set to network device name (diff) | |
| download | wireguard-openbsd-1e99a647b416c2fa87684901599d04c13b54e62b.tar.xz wireguard-openbsd-1e99a647b416c2fa87684901599d04c13b54e62b.zip | |
Add some USB HID devices.
| -rw-r--r-- | sys/arch/powerpc64/conf/BOOT | 9 | ||||
| -rw-r--r-- | sys/arch/powerpc64/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/powerpc64/conf/RAMDISK | 9 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sys/arch/powerpc64/conf/BOOT b/sys/arch/powerpc64/conf/BOOT index c63d0ead5c3..2947d1ed455 100644 --- a/sys/arch/powerpc64/conf/BOOT +++ b/sys/arch/powerpc64/conf/BOOT @@ -1,4 +1,4 @@ -# $OpenBSD: BOOT,v 1.5 2020/08/03 19:05:46 deraadt Exp $ +# $OpenBSD: BOOT,v 1.6 2020/08/24 13:20:34 kettenis Exp $ machine powerpc64 maxusers 4 @@ -53,6 +53,12 @@ uk* at scsibus? # unknown SCSI # USB devices uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs +uhidev* at uhub? # Human Interface Devices +uhid* at uhidev? # USB generic HID support +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +ums* at uhidev? # USB mouse +wsmouse* at ums? mux 0 umass* at uhub? # USB Mass Storage devices pseudo-device loop 1 @@ -62,3 +68,4 @@ pseudo-device bpfilter 1 pseudo-device rd 1 pseudo-device bio 1 pseudo-device kexec +pseudo-device wsmux 2 diff --git a/sys/arch/powerpc64/conf/GENERIC b/sys/arch/powerpc64/conf/GENERIC index f22e71a9842..696f491035d 100644 --- a/sys/arch/powerpc64/conf/GENERIC +++ b/sys/arch/powerpc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.16 2020/08/23 19:18:42 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.17 2020/08/24 13:20:34 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -52,9 +52,16 @@ uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs uaudio* at uhub? # USB Audio audio* at uaudio? +uhidev* at uhub? # Human Interface Devices +uhid* at uhidev? # USB generic HID support +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +ums* at uhidev? # USB mouse +wsmouse* at ums? mux 0 umass* at uhub? # USB Mass Storage devices brgphy* at mii? # Broadcom Gigabit PHYs # Pseudo-Devices pseudo-device openprom +pseudo-device wsmux 2 diff --git a/sys/arch/powerpc64/conf/RAMDISK b/sys/arch/powerpc64/conf/RAMDISK index 883b4a541e0..bf4b4fee231 100644 --- a/sys/arch/powerpc64/conf/RAMDISK +++ b/sys/arch/powerpc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.8 2020/08/23 21:48:08 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.9 2020/08/24 13:20:34 kettenis Exp $ machine powerpc64 maxusers 4 @@ -54,6 +54,12 @@ uk* at scsibus? # unknown SCSI # USB devices uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs +uhidev* at uhub? # Human Interface Devices +uhid* at uhidev? # USB generic HID support +ukbd* at uhidev? # USB keyboard +wskbd* at ukbd? mux 1 +ums* at uhidev? # USB mouse +wsmouse* at ums? mux 0 umass* at uhub? # USB Mass Storage devices brgphy* at mii? @@ -64,3 +70,4 @@ pseudo-device trunk pseudo-device bpfilter 1 pseudo-device rd 1 pseudo-device bio 1 +pseudo-device wsmux 2 |