summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-11-27 10:59:32 +0000
committermpi <mpi@openbsd.org>2015-11-27 10:59:32 +0000
commitc45fab1ddaecc27045b544cfe9f11a09486c94c5 (patch)
treecdfe6272ce3c7781d450a19862d9c6ae5840e575
parentregen (diff)
downloadwireguard-openbsd-c45fab1ddaecc27045b544cfe9f11a09486c94c5.tar.xz
wireguard-openbsd-c45fab1ddaecc27045b544cfe9f11a09486c94c5.zip
Attach the iPhone 6 as ugen(4), from Laurent GUALDI.
-rw-r--r--sys/dev/usb/uaudio.c6
-rw-r--r--sys/dev/usb/usb_quirks.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 7bdce7a8336..571d90c02ea 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.112 2015/06/15 15:45:28 mpi Exp $ */
+/* $OpenBSD: uaudio.c,v 1.113 2015/11/27 10:59:32 mpi Exp $ */
/* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */
/*
@@ -193,10 +193,12 @@ struct uaudio_devs {
UAUDIO_FLAG_BAD_AUDIO },
{ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4S },
UAUDIO_FLAG_BAD_AUDIO },
+ { { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_6 },
+ 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 },
+ 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 },
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index d38a40f6d4a..e610d129c1e 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.73 2014/03/20 15:07:11 abieber Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.74 2015/11/27 10:59:32 mpi 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 $ */
@@ -115,6 +115,7 @@ const struct usbd_quirk_entry {
{ 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_IPHONE_6, 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 }},