Drop the old problematic claim multiple report ids logic now that all

uhidev drivers have been fixed.

diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 2cf222e..3526e4c 100644 (file)
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uhidev.c,v 1.102 2021/11/22 03:30:20 jsg Exp $        */
+/*     $OpenBSD: uhidev.c,v 1.103 2021/11/22 11:30:16 anton Exp $      */
 /*     $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $     */
 
 /*
@@ -249,7 +249,7 @@ uhidev_attach(struct device *parent, struct device *self, void *aux)
 
        uha.uaa = uaa;
        uha.parent = sc;
-       uha.reportid = __UHIDEV_CLAIM_MULTIPLE_REPORTID;
+       uha.reportid = 0;
        uha.nreports = nrepid;
        uha.claimed = malloc(nrepid, M_TEMP, M_WAITOK|M_ZERO);
 
@@ -361,7 +361,7 @@ uhidevprint(void *aux, const char *pnp)
 
        if (pnp)
                printf("uhid at %s", pnp);
-       if (uha->reportid != 0 && uha->reportid != __UHIDEV_CLAIM_MULTIPLE_REPORTID)
+       if (uha->reportid != 0)
                printf(" reportid %d", uha->reportid);
        return (UNCONF);
 }

diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h
index ba07ef9..8960e0e 100644 (file)
--- a/sys/dev/usb/uhidev.h
+++ b/sys/dev/usb/uhidev.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uhidev.h,v 1.39 2021/11/15 15:38:08 anton Exp $       */
+/*     $OpenBSD: uhidev.h,v 1.40 2021/11/22 11:30:16 anton Exp $       */
 /*     $NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $   */
 
 /*
@@ -80,7 +80,6 @@ struct uhidev_attach_arg {
 };
 
 #define UHIDEV_CLAIM_MULTIPLE_REPORTID(u)      ((u)->claimed != NULL)
-#define        __UHIDEV_CLAIM_MULTIPLE_REPORTID        255     /* XXX */
 
 int uhidev_report_type_conv(int);
 void uhidev_get_report_desc(struct uhidev_softc *, void **, int *);