Module Name: src
Committed By: jmcneill
Date: Fri Nov 4 19:46:55 UTC 2022
Modified Files:
src/sys/dev/usb: uhidev.c
Log Message:
Back out r1.82 ("Do not explicitly set the HID Report Protocol upon attach")
due to the regression reported in PR# 57031
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/uhidev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.93 src/sys/dev/usb/uhidev.c:1.94
--- src/sys/dev/usb/uhidev.c:1.93 Mon Mar 28 12:44:45 2022
+++ src/sys/dev/usb/uhidev.c Fri Nov 4 19:46:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.93 2022/03/28 12:44:45 riastradh Exp $ */
+/* $NetBSD: uhidev.c,v 1.94 2022/11/04 19:46:55 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.93 2022/03/28 12:44:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.94 2022/11/04 19:46:55 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -223,16 +223,8 @@ uhidev_attach(device_t parent, device_t
}
(void)usbd_set_idle(iface, 0, 0);
-#if 0
- /*
- * HID 1.11 says we should do this, but the device firmware is
- * supposed to come up in Report Protocol after reset anyway, and
- * apparently explicitly requesting it confuses some devices.
- */
- if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0 &&
- id->bInterfaceSubClass == UISUBCLASS_BOOT)
+ if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_NO_SET_PROTO) == 0)
(void)usbd_set_protocol(iface, 1);
-#endif
maxinpktsize = 0;
sc->sc_iep_addr = sc->sc_oep_addr = -1;
