Skip to content

Commit

Permalink
conf: Add usbhid and hidbus to GENERIC* kernel configs
Browse files Browse the repository at this point in the history 
Include the new unified HID stack by default in generic.
This will allow us to migrate to the multi-stack hkbd and hms instead of
relying on the older ukbd and ums which only work with USB.
To test those drivers just add hw.usb.usbhid.enable=1 in loader.conf

Differential Revision:	https://reviews.freebsd.org/D45658
Reviewed by:	emaste, imp, wulf (all older version)
Sponsored by:	Beckhoff Automation GmbH & Co. KG

(cherry picked from commit 13d00a43cba4c35fcc9e0ab567baf530126a6348)

conf: hidmap is always needed for hms

So bring it in when hms is in the kernel config

Fixes:	13d00a43cba4 ("conf: Add usbhid and hidbus to GENERIC* kernel configs")
Sponsored by:	Beckhoff Automation GmbH & Co. KG

(cherry picked from commit 5ed91e788f0b97c9e6c544671ffef71fad7cad27)

conf: powerpc: Add evdev to some kernel configs

Fixes:	13d00a43cba4 ("conf: Add usbhid and hidbus to GENERIC* kernel configs")
Sponsored by:	Beckhoff Automation GmbH & Co. KG

(cherry picked from commit 43a62df0b464e60895084c7f9d9eddf70906fda3)
  • Loading branch information
@evadot
evadot committed Jul 29, 2024
1 parent 2684490 commit 8e908fa
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 10 deletions.
5 changes: 4 additions & 1 deletion sys/amd64/conf/GENERIC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@ device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
device ukbd # Keyboard
device usbhid # USB HID Transport
device hkbd # HID Keyboard
device ukbd # USB Keyboard
device umass # Disks/Mass storage - Requires scbus and da

# Sound support
Expand Down Expand Up @@ -379,4 +381,5 @@ device uinput # install /dev/uinput cdev
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus
options IICHID_SAMPLING # Workaround missing GPIO INTR support
4 changes: 4 additions & 0 deletions sys/arm/conf/GENERIC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ device musb

device axe # USB-Ethernet
device umass # Disks/Mass storage - Requires scbus and da
device usbhid # USB HID Transport
device uhid # "Human Interface Devices"
device hkbd # Allow keyboard like HIDs to control console
device ukbd # Allow keyboard like HIDs to control console

# Device mode support
Expand Down Expand Up @@ -226,6 +228,7 @@ device sound
# Framebuffer support
device vt
device kbdmux
device hms
device ums
device videomode
device vchiq
Expand Down Expand Up @@ -263,6 +266,7 @@ device aw_thermal # Allwinner Thermal Sensor Controller

# HID support
device hid # Generic HID support
device hidbus # Generic HID Bus

# Flattened Device Tree
options FDT # Configure using FDT/DTB data
Expand Down
1 change: 1 addition & 0 deletions sys/arm/conf/RPI-B
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ device usb_template # Control of the gadget
# Comment following lines for boot console on serial port
device vt
device kbdmux
device hkbd
device ukbd

device sdhci
Expand Down
4 changes: 4 additions & 0 deletions sys/arm/conf/TEGRA124
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ device ehci # EHCI USB interface
device xhci # XHCI USB interface
device tegra124_xusb_fw # Tegra XUSB firmware
device usb # USB Bus (required)
device usbhid # USB HID Transport
device umass # Disks/Mass storage - Requires scbus and da
device uhid # "Human Interface Devices"
#device u3g # USB modems
Expand Down Expand Up @@ -130,6 +131,9 @@ device drm2

# HID support
device hid # Generic HID support
device hidbus # Generic HID Bus
device hkbd # Allow keyboard like HIDs to control console
device hms # HID mouse

# Flattened Device Tree
options FDT # Configure using FDT/DTB data
Expand Down
5 changes: 4 additions & 1 deletion sys/arm64/conf/std.dev
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ device uhci # UHCI USB interface
device ehci # EHCI USB interface (USB 2.0)
device xhci # XHCI USB interface (USB 3.0)
device usb # USB Bus (required)
device ukbd # Keyboard
device usbhid # USB HID Transport
device hkbd # HID Keyboard
device ukbd # USB Keyboard
device umass # Disks/Mass storage - Requires scbus and da

# Sound support
Expand All @@ -111,6 +113,7 @@ device mmcsd # mmc/sd flash cards
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus

# Firmware
device mmio_sram # Generic on-chip SRAM
2 changes: 1 addition & 1 deletion sys/conf/files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,7 @@ dev/hid/hgame.c optional hgame
dev/hid/hid.c optional hid
dev/hid/hid_if.m optional hid
dev/hid/hidbus.c optional hidbus
dev/hid/hidmap.c optional hidmap
dev/hid/hidmap.c optional hidmap | hms
dev/hid/hidquirk.c optional hid
dev/hid/hidraw.c optional hidraw
dev/hid/hkbd.c optional hkbd
Expand Down
5 changes: 4 additions & 1 deletion sys/i386/conf/GENERIC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
device ukbd # Keyboard
device usbhid # USB HID Transport
device hkbd # HID Keyboard
device ukbd # USB Keyboard
device umass # Disks/Mass storage - Requires scbus and da

# Sound support
Expand Down Expand Up @@ -333,4 +335,5 @@ device uinput # install /dev/uinput cdev
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus
options IICHID_SAMPLING # Workaround missing GPIO INTR support
8 changes: 6 additions & 2 deletions sys/powerpc/conf/GENERIC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,15 @@ device uhci # UHCI PCI->USB interface
device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface
device usb # USB Bus (required)
device usbhid # USB HID Transport
device uhid # "Human Interface Devices"
device ukbd # Keyboard
device hkbd # HID Keyboard
device ukbd # USB Keyboard
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
device hms # HID Mouse
device ums # USB Mouse
device atp # Apple USB touchpad
device urio # Diamond Rio 500 MP3 player
# USB Ethernet
Expand Down Expand Up @@ -233,3 +236,4 @@ device virtio_balloon # VirtIO Memory Balloon device
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus
8 changes: 6 additions & 2 deletions sys/powerpc/conf/GENERIC64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,14 @@ device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface
device xhci # XHCI PCI->USB interface
device usb # USB Bus (required)
device usbhid # USB HID Transport
device uhid # "Human Interface Devices"
device ukbd # Keyboard
device hkbd # HID Keyboard
device ukbd # USB Keyboard
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
device hms # HID Mouse
device ums # USB Mouse
# USB Ethernet
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
Expand Down Expand Up @@ -285,3 +288,4 @@ device virtio_balloon # VirtIO Memory Balloon device
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus
8 changes: 6 additions & 2 deletions sys/powerpc/conf/GENERIC64LE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,14 @@ device ohci # OHCI PCI->USB interface
device ehci # EHCI PCI->USB interface
device xhci # XHCI PCI->USB interface
device usb # USB Bus (required)
device usbhid # USB HID Transport
device uhid # "Human Interface Devices"
device ukbd # Keyboard
device hkbd # HID Keyboard
device ukbd # USB Keyboard
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
device umass # Disks/Mass storage - Requires scbus and da0
device ums # Mouse
device hms # HID Mouse
device ums # USB Mouse
# USB Ethernet
device aue # ADMtek USB Ethernet
device axe # ASIX Electronics USB Ethernet
Expand Down Expand Up @@ -266,3 +269,4 @@ device virtio_balloon # VirtIO Memory Balloon device
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus
9 changes: 9 additions & 0 deletions sys/powerpc/conf/MPC85XX
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,13 @@ device uart
options USB_DEBUG # enable debug msgs
#device uhci
device ehci
device hkbd
device ukbd
device hms
device ums
device umass
device usb
device usbhid
device vlan

# P1022 DIU
Expand All @@ -120,6 +123,12 @@ device videomode
device vt
device fbd

# evdev interface
options EVDEV_SUPPORT # evdev support in legacy drivers
device evdev # input event device support
device uinput # install /dev/uinput cdev

# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID bus
9 changes: 9 additions & 0 deletions sys/powerpc/conf/MPC85XXSPE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,13 @@ device uart
options USB_DEBUG # enable debug msgs
#device uhci
device ehci
device hkbd
device ukbd
device hms
device ums
device umass
device usb
device usbhid
device vlan

# VirtIO support
Expand All @@ -135,6 +138,12 @@ device videomode
device vt
device fbd

# evdev interface
options EVDEV_SUPPORT # evdev support in legacy drivers
device evdev # input event device support
device uinput # install /dev/uinput cdev

# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID bus
9 changes: 9 additions & 0 deletions sys/powerpc/conf/QORIQ64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,24 @@ options USB_DEBUG # enable debug msgs
device ehci
device umass
device usb
device usbhid
device vlan

# Desktop related
device vt
device fbd
options KBD_INSTALL_CDEV
device hkbd
device ukbd
device hms
device ums

# evdev interface
options EVDEV_SUPPORT # evdev support in legacy drivers
device evdev # input event device support
device uinput # install /dev/uinput cdev

# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID bus
3 changes: 3 additions & 0 deletions sys/riscv/conf/GENERIC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,15 @@ device uhci # UHCI USB interface
device ehci # EHCI USB interface (USB 2.0)
device xhci # XHCI USB interface (USB 3.0)
device usb # USB Bus (required)
device usbhid # USB HID Transport
device hkbd # Keyboard
device ukbd # Keyboard
device umass # Disks/Mass storage - Requires scbus and da

# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID Bus

# DTrace support
# device dtrace
Expand Down

0 comments on commit 8e908fa

Please sign in to comment.