The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=74072e9f16c17c5f1eaf3bc1df4b166a8b2c292c
commit 74072e9f16c17c5f1eaf3bc1df4b166a8b2c292c
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-05-20 15:27:26 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2025-07-30 18:31:54 +0000
usbhid: Enable by default
Co-authored-by: Emmanuel Vadot <m...@freebsd.org>
Reviewed by: bapt, wulf
Relnotes: Yes
Sponsored by: Beckhoff Automation GmbH & Co. KG
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45659
---
UPDATING | 10 ++++++++++
share/man/man4/usbhid.4 | 4 ++--
sys/dev/usb/input/usbhid.c | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/UPDATING b/UPDATING
index 5fb9574dfb0f..541bdf7ee7c7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20250730:
+ The usbhid(4) USB HID driver is now enabled by default, and will be
+ used in preference to other USB HID drivers like ukbd(4), ums(4), and
+ uhid(4). Work on a FIDO/U2F driver and moused(8) is in progress.
+ The default is being switched now so that we can find and fix any
+ additional issues prior to FreeBSD 15.0.
+
+ To revert to the previous USB HID driver behavior, set the loader
+ tunable hw.usb.usbhid_enable=0.
+
20250727:
bmake (i.e., /usr/bin/make and /usr/share/mk) has moved to a new
package, FreeBSD-bmake. If you use pkgbase and you need make, you
diff --git a/share/man/man4/usbhid.4 b/share/man/man4/usbhid.4
index 5109bbe72de6..e5ba370cd025 100644
--- a/share/man/man4/usbhid.4
+++ b/share/man/man4/usbhid.4
@@ -21,7 +21,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 12, 2021
+.Dd July 30, 2025
.Dt USBHID 4
.Os
.Sh NAME
@@ -60,7 +60,7 @@ and make its priority greater than other USB HID drivers,
such as
.Xr ums 4 ,
and
.Xr uhid 4 .
-Default is 0.
+Default is 1.
.El
.Bl -tag -width indent
.It Va hw.usb.usbhid.debug
diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c
index 3bb7d5e594e3..df810012b3f8 100644
--- a/sys/dev/usb/input/usbhid.c
+++ b/sys/dev/usb/input/usbhid.c
@@ -76,7 +76,7 @@
#include "hid_if.h"
static SYSCTL_NODE(_hw_usb, OID_AUTO, usbhid, CTLFLAG_RW, 0, "USB usbhid");
-static int usbhid_enable = 0;
+static int usbhid_enable = 1;
SYSCTL_INT(_hw_usb_usbhid, OID_AUTO, enable, CTLFLAG_RWTUN,
&usbhid_enable, 0, "Enable usbhid and prefer it to other USB HID drivers");
#ifdef USB_DEBUG
