diff options
| -rw-r--r-- | sys/dev/usb/ugen.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/uhid.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/uhidev.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/uhidev.h | 3 | ||||
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 14 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi.h | 3 |
6 files changed, 8 insertions, 32 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index be8a9d29773..c072ae7dbcd 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.75 2013/11/06 16:58:13 pirofti Exp $ */ +/* $OpenBSD: ugen.c,v 1.76 2013/11/19 14:04:07 pirofti Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -140,10 +140,6 @@ ugen_match(struct device *parent, void *match, void *aux) { struct usb_attach_arg *uaa = aux; -#if 0 - if (uaa->matchlvl) - return (uaa->matchlvl); -#endif if (uaa->usegeneric) { return (UMATCH_GENERIC); } else diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index d7beed1f209..f16bf5c1670 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.54 2013/11/15 08:17:44 pirofti Exp $ */ +/* $OpenBSD: uhid.c,v 1.55 2013/11/19 14:04:07 pirofti Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -114,12 +114,12 @@ const struct cfattach uhid_ca = { int uhid_match(struct device *parent, void *match, void *aux) { +#ifdef UHID_DEBUG struct uhidev_attach_arg *uha = (struct uhidev_attach_arg *)aux; +#endif DPRINTF(("uhid_match: report=%d\n", uha->reportid)); - if (uha->matchlvl) - return (uha->matchlvl); return (UMATCH_IFACECLASS_GENERIC); } diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index de4258898b5..a34257e4249 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.50 2013/11/11 09:16:03 pirofti Exp $ */ +/* $OpenBSD: uhidev.c,v 1.51 2013/11/19 14:04:07 pirofti Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -110,8 +110,6 @@ uhidev_match(struct device *parent, void *match, void *aux) return (UMATCH_NONE); if (usbd_get_quirks(uaa->device)->uq_flags & UQ_BAD_HID) return (UMATCH_NONE); - if (uaa->matchlvl) - return (uaa->matchlvl); return (UMATCH_IFACECLASS_GENERIC); } @@ -332,10 +330,6 @@ int uhidevsubmatch(struct device *parent, void *match, void *aux) if (cf->uhidevcf_reportid != UHIDEV_UNK_REPORTID && cf->uhidevcf_reportid != uha->reportid) return (0); - if (cf->uhidevcf_reportid == uha->reportid) - uha->matchlvl = UMATCH_VENDOR_PRODUCT; - else - uha->matchlvl = 0; return ((*cf->cf_attach->ca_match)(parent, cf, aux)); } diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h index dfe5c6488bf..231d3cc3fea 100644 --- a/sys/dev/usb/uhidev.h +++ b/sys/dev/usb/uhidev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.h,v 1.15 2013/11/15 08:17:44 pirofti Exp $ */ +/* $OpenBSD: uhidev.h,v 1.16 2013/11/19 14:04:07 pirofti Exp $ */ /* $NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $ */ /* @@ -82,7 +82,6 @@ struct uhidev_attach_arg { struct uhidev_softc *parent; int reportid; int reportsize; - int matchlvl; }; void uhidev_get_report_desc(struct uhidev_softc *, void **, int *); diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index dd10ac8752e..ad96f4e882d 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.94 2013/11/02 12:23:58 mpi Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.95 2013/11/19 14:04:07 pirofti Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -1300,18 +1300,6 @@ usbd_submatch(struct device *parent, void *match, void *aux) ) ) return 0; - if (cf->uhubcf_vendor != UHUB_UNK_VENDOR && - cf->uhubcf_vendor == uaa->vendor && - cf->uhubcf_product != UHUB_UNK_PRODUCT && - cf->uhubcf_product == uaa->product) { - /* We have a vendor&product locator match */ - if (cf->uhubcf_release != UHUB_UNK_RELEASE && - cf->uhubcf_release == uaa->release) - uaa->matchlvl = UMATCH_VENDOR_PRODUCT_REV; - else - uaa->matchlvl = UMATCH_VENDOR_PRODUCT; - } else - uaa->matchlvl = 0; return ((*cf->cf_attach->ca_match)(parent, cf, aux)); } diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index ceb1d09245a..68dbf2d64f4 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.h,v 1.59 2013/11/15 10:17:39 pirofti Exp $ */ +/* $OpenBSD: usbdi.h,v 1.60 2013/11/19 14:04:07 pirofti Exp $ */ /* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -219,7 +219,6 @@ struct usb_attach_arg { int vendor; int product; int release; - int matchlvl; struct usbd_device *device; /* current device */ struct usbd_interface *iface; /* current interface */ int usegeneric; |