summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2020-08-24 13:20:35 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2020-08-24 13:20:35 +0000
commitf7cf778bf19679d1fdcb1d5617ab09cb278cd51a (patch)
treea4398b9f0c39d5911f0addb42920e0a8593c8667 /sys/arch
parentdd8adfd580f2c3f4272999276cb8a02b62018951 (diff)
Add some USB HID devices.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/powerpc64/conf/BOOT9
-rw-r--r--sys/arch/powerpc64/conf/GENERIC9
-rw-r--r--sys/arch/powerpc64/conf/RAMDISK9
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