upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-05 06:42:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: Add usbhid and hidbus to GENERIC* kernel configs

Browse source 
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
This commit is contained in:
Emmanuel Vadot 2024-06-20 09:30:07 +02:00
parent 5f75cd390a
commit 13d00a43cb
13 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/amd64/conf/GENERIC
View file

@ -324,7 +324,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
@ -375,6 +377,7 @@ 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
# EFI devices

4
sys/arm/conf/GENERIC
View file

@ -191,7 +191,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
@ -225,6 +227,7 @@ device sound
# Framebuffer support
device vt
device kbdmux
device hms
device ums
device videomode
device vchiq
@ -262,6 +265,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

1
sys/arm/conf/RPI-B
View file

@ -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

4
sys/arm/conf/TEGRA124
View file

@ -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
@ -129,6 +130,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

5
sys/arm64/conf/std.dev
View file

@ -99,7 +99,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
@ -112,6 +114,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

5
sys/i386/conf/GENERIC
View file

@ -289,7 +289,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
@ -336,4 +338,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
sys/powerpc/conf/GENERIC
View file

@ -174,12 +174,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
@ -235,3 +238,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
sys/powerpc/conf/GENERIC64
View file

@ -214,11 +214,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
@ -288,3 +291,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
sys/powerpc/conf/GENERIC64LE
View file

@ -210,11 +210,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
@ -269,3 +272,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

4
sys/powerpc/conf/MPC85XX
View file

@ -109,10 +109,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
@ -124,3 +127,4 @@ device fbd
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID bus

4
sys/powerpc/conf/MPC85XXSPE
View file

@ -116,10 +116,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
@ -139,3 +142,4 @@ device fbd
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID bus

4
sys/powerpc/conf/QORIQ64
View file

@ -112,15 +112,19 @@ 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
# HID support
options HID_DEBUG # enable debug msgs
device hid # Generic HID support
device hidbus # Generic HID bus

3
sys/riscv/conf/GENERIC
View file

@ -119,12 +119,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
# Serial (COM) ports
device uart # Generic UART driver