Allows gphoto2 for PTP transfers, plus other libusb stuff in the future.

-Bryan.

Index: uaudio.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uaudio.c,v
retrieving revision 1.94
diff -u -p -u -r1.94 uaudio.c
--- uaudio.c    26 Jan 2012 09:00:36 -0000      1.94
+++ uaudio.c    30 Jan 2012 23:25:23 -0000
@@ -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 },
Index: usb_quirks.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/usb_quirks.c,v
retrieving revision 1.65
diff -u -p -u -r1.65 usb_quirks.c
--- usb_quirks.c        1 Dec 2011 23:02:12 -0000       1.65
+++ usb_quirks.c        30 Jan 2012 23:25:23 -0000
@@ -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 }},
Index: usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.570
diff -u -p -u -r1.570 usbdevs
--- usbdevs     29 Jan 2012 10:59:23 -0000      1.570
+++ usbdevs     30 Jan 2012 23:25:24 -0000
@@ -893,8 +893,10 @@ product APPLE IPOD_TOUCH_2G        0x1293  iPod 
 product APPLE IPHONE_3GS       0x1294  iPhone 3GS
 product APPLE IPHONE_4_GSM     0x1297  iPhone 4 GSM
 product APPLE IPOD_TOUCH_3G    0x1299  iPod Touch 3G
+product APPLE IPAD             0x129a  iPad
 product APPLE IPHONE_4_CDMA    0x129c  iPhone 4 CDMA
 product APPLE IPOD_TOUCH_4G    0x129e  iPod Touch 4G
+product APPLE IPAD2            0x129f  iPad 2
 product APPLE IPHONE_4S                0x12a0  iPhone 4S
 product APPLE ETHERNET         0x1402  Ethernet A1277
 product APPLE BLUETOOTH2       0x8205  Bluetooth

Reply via email to