Sun Mar 14 08:44:46 2010 UTC ()
add device id and quirks for iPhone 3GS (just copy the 3G ones)


(explorer)
diff -r1.65 -r1.66 src/sys/dev/usb/usb_quirks.c
diff -r1.546 -r1.547 src/sys/dev/usb/usbdevs
cvs diff -r1.65 -r1.66 src/sys/dev/usb/usb_quirks.c (expand / switch to unified diff)

--- src/sys/dev/usb/usb_quirks.c 2009/07/29 16:04:14 1.65
+++ src/sys/dev/usb/usb_quirks.c 2010/03/14 08:44:46 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: usb_quirks.c,v 1.65 2009/07/29 16:04:14 jakllsch Exp $ */ 1/* $NetBSD: usb_quirks.c,v 1.66 2010/03/14 08:44:46 explorer Exp $ */
2/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */ 2/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. 5 * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to The NetBSD Foundation 8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Lennart Augustsson (lennart@augustsson.net) at 9 * by Lennart Augustsson (lennart@augustsson.net) at
10 * Carlstedt Research & Technology. 10 * Carlstedt Research & Technology.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 22 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
23 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 23 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 31 * POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.65 2009/07/29 16:04:14 jakllsch Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.66 2010/03/14 08:44:46 explorer Exp $");
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/systm.h> 38#include <sys/systm.h>
39 39
40#include <dev/usb/usb.h> 40#include <dev/usb/usb.h>
41 41
42#include <dev/usb/usbdevs.h> 42#include <dev/usb/usbdevs.h>
43#include <dev/usb/usb_quirks.h> 43#include <dev/usb/usb_quirks.h>
44 44
45#ifdef USB_DEBUG 45#ifdef USB_DEBUG
46extern int usbdebug; 46extern int usbdebug;
47#endif 47#endif
48 48
@@ -115,26 +115,28 @@ Static const struct usbd_quirk_entry { @@ -115,26 +115,28 @@ Static const struct usbd_quirk_entry {
115 { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY760, ANY, { UQ_BROKEN_BIDIR }}, 115 { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY760, ANY, { UQ_BROKEN_BIDIR }},
116 { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY920, ANY, { UQ_BROKEN_BIDIR }}, 116 { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY920, ANY, { UQ_BROKEN_BIDIR }},
117 { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY800, ANY, { UQ_BROKEN_BIDIR }}, 117 { USB_VENDOR_NEC, USB_PRODUCT_NEC_PICTY800, ANY, { UQ_BROKEN_BIDIR }},
118 118
119 { USB_VENDOR_HP, USB_PRODUCT_HP_1220C, ANY, { UQ_BROKEN_BIDIR }}, 119 { USB_VENDOR_HP, USB_PRODUCT_HP_1220C, ANY, { UQ_BROKEN_BIDIR }},
120 120
121 /* HID and audio are both invalid on iPhone/iPod Touch */ 121 /* HID and audio are both invalid on iPhone/iPod Touch */
122 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, 122 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
123 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }}, 123 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
124 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH, 124 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPOD_TOUCH,
125 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }}, 125 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
126 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, 126 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G,
127 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }}, 127 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
 128 { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS,
 129 ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
128 130
129 { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM, 131 { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM,
130 ANY, { UQ_ASSUME_CM_OVER_DATA }}, 132 ANY, { UQ_ASSUME_CM_OVER_DATA }},
131 { USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_CDMA_MSM, 133 { USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_CDMA_MSM,
132 ANY, { UQ_ASSUME_CM_OVER_DATA }}, 134 ANY, { UQ_ASSUME_CM_OVER_DATA }},
133 { USB_VENDOR_HYUNDAI, USB_PRODUCT_HYUNDAI_UM175, 135 { USB_VENDOR_HYUNDAI, USB_PRODUCT_HYUNDAI_UM175,
134 ANY, { UQ_ASSUME_CM_OVER_DATA }}, 136 ANY, { UQ_ASSUME_CM_OVER_DATA }},
135 { 0, 0, 0, { 0 } } 137 { 0, 0, 0, { 0 } }
136}; 138};
137 139
138const struct usbd_quirks usbd_no_quirk = { 0 }; 140const struct usbd_quirks usbd_no_quirk = { 0 };
139 141
140const struct usbd_quirks * 142const struct usbd_quirks *
cvs diff -r1.546 -r1.547 src/sys/dev/usb/usbdevs (expand / switch to unified diff)

--- src/sys/dev/usb/usbdevs 2010/03/11 10:35:22 1.546
+++ src/sys/dev/usb/usbdevs 2010/03/14 08:44:46 1.547
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: usbdevs,v 1.546 2010/03/11 10:35:22 enami Exp $ 1$NetBSD: usbdevs,v 1.547 2010/03/14 08:44:46 explorer Exp $
2 2
3/* 3/*
4 * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Lennart Augustsson (lennart@augustsson.net) at 8 * by Lennart Augustsson (lennart@augustsson.net) at
9 * Carlstedt Research & Technology. 9 * Carlstedt Research & Technology.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -689,26 +689,27 @@ product ANYDATA ADU_500A 0x6502 ADU-E500 @@ -689,26 +689,27 @@ product ANYDATA ADU_500A 0x6502 ADU-E500
689 689
690/* AOX, Inc. products */ 690/* AOX, Inc. products */
691product AOX USB101 0x0008 USB ethernet controller engine 691product AOX USB101 0x0008 USB ethernet controller engine
692 692
693/* Apple Computer products */ 693/* Apple Computer products */
694product APPLE EXT_KBD 0x020c Apple Extended USB Keyboard 694product APPLE EXT_KBD 0x020c Apple Extended USB Keyboard
695product APPLE OPTMOUSE 0x0302 Optical mouse 695product APPLE OPTMOUSE 0x0302 Optical mouse
696product APPLE MIGHTYMOUSE 0x0304 Mighty Mouse 696product APPLE MIGHTYMOUSE 0x0304 Mighty Mouse
697product APPLE EXT_KBD_HUB 0x1003 Hub in Apple Extended USB Keyboard 697product APPLE EXT_KBD_HUB 0x1003 Hub in Apple Extended USB Keyboard
698product APPLE SPEAKERS 0x1101 Speakers 698product APPLE SPEAKERS 0x1101 Speakers
699product APPLE IPHONE 0x1290 iPhone 699product APPLE IPHONE 0x1290 iPhone
700product APPLE IPOD_TOUCH 0x1291 iPod Touch 700product APPLE IPOD_TOUCH 0x1291 iPod Touch
701product APPLE IPHONE_3G 0x1292 iPhone 3G 701product APPLE IPHONE_3G 0x1292 iPhone 3G
 702product APPLE IPHONE_3GS 0x1294 iPhone 3GS
702product APPLE ETHERNET 0x1402 Apple USB to Ethernet 703product APPLE ETHERNET 0x1402 Apple USB to Ethernet
703 704
704/* ArkMicroChips products */ 705/* ArkMicroChips products */
705product ARKMICROCHIPS USBSERIAL 0x0232 USB-UART Controller 706product ARKMICROCHIPS USBSERIAL 0x0232 USB-UART Controller
706 707
707/* Asahi Optical products */ 708/* Asahi Optical products */
708product ASAHIOPTICAL OPTIO230 0x0004 PENTAX Optio230 709product ASAHIOPTICAL OPTIO230 0x0004 PENTAX Optio230
709product ASAHIOPTICAL OPTIO330 0x0006 Digital camera 710product ASAHIOPTICAL OPTIO330 0x0006 Digital camera
710 711
711/* Asante products */ 712/* Asante products */
712product ASANTE EA 0x1427 Ethernet Adapter 713product ASANTE EA 0x1427 Ethernet Adapter
713 714
714/* ASIX Electronics products */ 715/* ASIX Electronics products */