git: 13d00a43cba4 - main - conf: Add usbhid and hidbus to GENERIC* kernel configs
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Jul 2024 06:06:02 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=13d00a43cba4c35fcc9e0ab567baf530126a6348
commit 13d00a43cba4c35fcc9e0ab567baf530126a6348
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-06-20 07:30:07 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-07-10 06:05:25 +0000
conf: Add usbhid and hidbus to GENERIC* kernel configs
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
---
sys/amd64/conf/GENERIC | 5 ++++-
sys/arm/conf/GENERIC | 4 ++++
sys/arm/conf/RPI-B | 1 +
sys/arm/conf/TEGRA124 | 4 ++++
sys/arm64/conf/std.dev | 5 ++++-
sys/i386/conf/GENERIC | 5 ++++-
sys/powerpc/conf/GENERIC | 8 ++++++--
sys/powerpc/conf/GENERIC64 | 8 ++++++--
sys/powerpc/conf/GENERIC64LE | 8 ++++++--
sys/powerpc/conf/MPC85XX | 4 ++++
sys/powerpc/conf/MPC85XXSPE | 4 ++++
sys/powerpc/conf/QORIQ64 | 4 ++++
sys/riscv/conf/GENERIC | 3 +++
13 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4a84e8e56596..49fe8fde0e81 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -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
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index 16830340df4f..b5321daa235a 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -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
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 844b31686d5a..d0a3ee13c367 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -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
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
index 223dd925e56b..6a39abf6cee4 100644
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -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
diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev
index eefff7e3a6e0..42c9fcf03b05 100644
--- a/sys/arm64/conf/std.dev
+++ b/sys/arm64/conf/std.dev
@@ -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
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index b32986e13769..e7851f7eb92c 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -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
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index dedaa931f4ef..7c7d2809d784 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -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
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 79f484e02dbc..9a363a5471a1 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -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
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 61f67b7246c6..6aeb188d7501 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -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
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
index c31f892a4208..3c79eeebcf61 100644
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -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
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
index 8ebc4a41bcb2..99a583d109f4 100644
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -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
diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64
index 369e83179c59..9b3205d33a7b 100644
--- a/sys/powerpc/conf/QORIQ64
+++ b/sys/powerpc/conf/QORIQ64
@@ -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
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index ce9038cee4a9..4e01c39bc008 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -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