summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBryan Steele <brynet@cvs.openbsd.org>2012-01-31 21:13:33 +0000
committerBryan Steele <brynet@cvs.openbsd.org>2012-01-31 21:13:33 +0000
commit6487eadc7b1c2904585b9f5e05377caa8103f29d (patch)
tree1f63026aa2a4460cf3152212aad958a3ac84a87f /sys/dev
parent43b013cfb2e2b16c90bf34fe4a2a1a4d6126a529 (diff)
add uhid/uaudio quirks for the iPad and iPad 2.
ok deraadt@/dcoppa@ and sthen@.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uaudio.c6
-rw-r--r--sys/dev/usb/usb_quirks.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index f7739c1a0fc..32e92dcffee 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.94 2012/01/26 09:00:36 ratchov Exp $ */
+/* $OpenBSD: uaudio.c,v 1.95 2012/01/31 21:13:32 brynet Exp $ */
/* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */
/*
@@ -207,6 +207,10 @@ struct uaudio_devs {
UAUDIO_FLAG_BAD_AUDIO },
{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH_4G },
UAUDIO_FLAG_BAD_AUDIO },
+ { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD },
+ UAUDIO_FLAG_BAD_AUDIO },
+ { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD2 },
+ 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 8aba3f671d7..58e243c35ee 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.65 2011/12/01 23:02:12 dhill Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.66 2012/01/31 21:13:32 brynet 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 $ */
@@ -120,7 +120,9 @@ const struct usbd_quirk_entry {
{ 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_IPOD_TOUCH_4G, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD, ANY, { UQ_BAD_HID }},
+ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPAD2, 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 }},