diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2009-10-17 07:10:39 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2009-10-17 07:10:39 +0000 |
| commit | 200f295b8e0f0296a93b7a591be6ba5953954fbe (patch) | |
| tree | 9bc4e43e5690f4a58b043e96b0ebe48163095c8d | |
| parent | 4827a29c5ffa51b65e031bc118ce16306f983d66 (diff) | |
remove bogus quirk. these devices do not lie about their type, but
they do have bSynchAddress set to 0 in their endpoint descriptor.
uaudio(4) used to not handle that correctly, but now does.
positive response from krw, deraadt, ratchov
| -rw-r--r-- | sys/dev/usb/uaudio.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usb_quirks.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usb_quirks.h | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 65bc4972284..8aa9409c391 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.63 2009/10/15 08:47:44 jakemsr Exp $ */ +/* $OpenBSD: uaudio.c,v 1.64 2009/10/17 07:10:37 jakemsr Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -1549,9 +1549,6 @@ uaudio_process_as(struct uaudio_softc *sc, const char *buf, int *offsp, dir = UE_GET_DIR(ed->bEndpointAddress); type = UE_GET_ISO_TYPE(ed->bmAttributes); - if ((usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_AU_INP_ASYNC) && - dir == UE_DIR_IN && type == UE_ISO_ADAPT) - type = UE_ISO_ASYNC; /* We can't handle endpoints that need a sync pipe yet. */ sync = FALSE; diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c index f50a8b88514..de2d117644e 100644 --- a/sys/dev/usb/usb_quirks.c +++ b/sys/dev/usb/usb_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_quirks.c,v 1.52 2009/05/11 08:07:42 yuo Exp $ */ +/* $OpenBSD: usb_quirks.c,v 1.53 2009/10/17 07:10:38 jakemsr Exp $ */ /* $NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */ @@ -105,12 +105,6 @@ const struct usbd_quirk_entry { { USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41, 0x110, { UQ_POWER_CLAIM }}, { USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0x009, { UQ_AU_NO_FRAC }}, - { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE, - 0x100, { UQ_AU_INP_ASYNC }}, - { USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO, - 0x101, { UQ_AU_INP_ASYNC }}, - { USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET, - 0x004, { UQ_AU_INP_ASYNC }}, { USB_VENDOR_TERRATEC, USB_PRODUCT_TERRATEC_AUREON, ANY, { UQ_BAD_HID }}, diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h index ef398007e04..9e6f0962d4d 100644 --- a/sys/dev/usb/usb_quirks.h +++ b/sys/dev/usb/usb_quirks.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_quirks.h,v 1.13 2008/06/29 10:04:15 yuo Exp $ */ +/* $OpenBSD: usb_quirks.h,v 1.14 2009/10/17 07:10:38 jakemsr Exp $ */ /* $NetBSD: usb_quirks.h,v 1.20 2001/04/15 09:38:01 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.9 1999/11/12 23:31:03 n_hibma Exp $ */ @@ -56,8 +56,6 @@ struct usbd_quirks { #define UQ_POWER_CLAIM 0x00000200 /* don't adjust for fractional samples */ #define UQ_AU_NO_FRAC 0x00000400 - /* input is async despite claim of adaptive */ -#define UQ_AU_INP_ASYNC 0x00000800 /* modem device breaks on cm over data */ #define UQ_ASSUME_CM_OVER_DATA 0x00001000 /* printer has broken bidir mode */ |