diff options
| author | David Hill <dhill@cvs.openbsd.org> | 2011-12-01 23:02:13 +0000 |
|---|---|---|
| committer | David Hill <dhill@cvs.openbsd.org> | 2011-12-01 23:02:13 +0000 |
| commit | 985e22581da35319ad382256994e85a54e7c73cb (patch) | |
| tree | 694b6e405468e38af1bf34a2a30aae0dab9661a8 /sys/dev/usb | |
| parent | e29966e175fcb96f2e50697488de9850fc94e233 (diff) | |
Mark Apple iPod and iPhone products with UQ_BAD_HID and UAUDIO_FLAG_BAD_AUDIO.
This allows these devices to attach as ugen, so at least we can use some apps,
like gphoto2 to retrieve media.
requested by a few, ok mikeb@
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/uaudio.c | 22 | ||||
| -rw-r--r-- | sys/dev/usb/usb_quirks.c | 12 |
2 files changed, 32 insertions, 2 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index e6da3039f99..53d16375957 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.92 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: uaudio.c,v 1.93 2011/12/01 23:02:12 dhill Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -187,6 +187,26 @@ struct uaudio_devs { UAUDIO_FLAG_BAD_ADC } , { { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495 }, UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_GSM }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_CDMA }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_2G }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_3G }, + UAUDIO_FLAG_BAD_AUDIO }, + { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G }, + UAUDIO_FLAG_BAD_AUDIO }, { { USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_EMU0202 }, UAUDIO_FLAG_VENDOR_CLASS | UAUDIO_FLAG_EMU0202 | UAUDIO_FLAG_DEPENDENT }, diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c index 3d049b390a7..8aba3f671d7 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.64 2011/03/09 17:03:06 sthen Exp $ */ +/* $OpenBSD: usb_quirks.c,v 1.65 2011/12/01 23:02:12 dhill 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 $ */ @@ -111,6 +111,16 @@ const struct usbd_quirk_entry { { USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_BAD_HID }}, { USB_VENDOR_APC, USB_PRODUCT_APC_UPS5G, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_CDMA, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4_GSM, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_2G, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_3G, ANY, { UQ_BAD_HID }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G, ANY, { UQ_BAD_HID }}, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS, ANY, { UQ_BAD_HID }}, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C100, ANY, { UQ_BAD_HID }}, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C120, ANY, { UQ_BAD_HID }}, |