English Language flag
// Log In
// CVSweb
Project: FreeWRT
// Summary // Activity // Search // Tracker // Lists // News // SCM // Wiki

SCM Repository

ViewVC logotype

Diff of /branches/freewrt_1_0/target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3771 by markus, Tue May 27 15:15:13 2008 UTC revision 3772 by markus, Wed Jul 2 14:28:35 2008 UTC
# Line 1  Line 1 
1  --- linux-2.4.36.4/drivers/usb/serial/usbserial.c.orig  2008-05-27 16:21:10.000000000 +0200  --- linux-2.4.36.6/drivers/usb/serial/usbserial.orig    2008-06-25 12:37:17.000000000 +0200
2  +++ linux-2.4.36.4/drivers/usb/serial/usbserial.c       2008-05-27 16:29:45.000000000 +0200  +++ linux-2.4.36.6/drivers/usb/serial/usbserial.c       2008-06-25 12:41:02.000000000 +0200
3  @@ -332,7 +332,7 @@  @@ -332,7 +332,7 @@
4   static __u16   vendor  = 0x05f9;   static __u16   vendor  = 0x05f9;
5   static __u16   product = 0xffff;   static __u16   product = 0xffff;
6    
7  -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */  -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
8  +static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */  +static struct usb_device_id generic_device_ids[10]; /* Initially all zeroes. */
9    
10   /* All of the device info needed for the Generic Serial Converter */   /* All of the device info needed for the Generic Serial Converter */
11   static struct usb_serial_device_type generic_device = {   static struct usb_serial_device_type generic_device = {
12  @@ -1831,6 +1831,38 @@  @@ -1831,6 +1831,42 @@
13          generic_device_ids[0].idVendor = vendor;          generic_device_ids[0].idVendor = vendor;
14          generic_device_ids[0].idProduct = product;          generic_device_ids[0].idProduct = product;
15          generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;          generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
# Line 29  Line 29 
29  +       generic_device_ids[4].idVendor = 0x0af0;  +       generic_device_ids[4].idVendor = 0x0af0;
30  +       generic_device_ids[4].idProduct = 0x7251;  +       generic_device_ids[4].idProduct = 0x7251;
31  +       generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;  +       generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
32  +       /* Huawei E600 */  +       /* Option Model: GE0301 */
33  +       generic_device_ids[5].idVendor = 0x12d1;  +       generic_device_ids[5].idVendor = 0x0af0;
34  +       generic_device_ids[5].idProduct = 0x1001;  +       generic_device_ids[5].idProduct = 0x7001;
35  +       generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;  +       generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
36  +       /* Huawei E270 HSPA USB modem */  +       /* Huawei E600 */
37  +       generic_device_ids[6].idVendor = 0x12d1;  +       generic_device_ids[6].idVendor = 0x12d1;
38  +       generic_device_ids[6].idProduct = 0x1003;  +       generic_device_ids[6].idProduct = 0x1001;
39  +       generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;  +       generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
40  +       /* Audiovox Aircard */  +       /* Huawei E270 HSPA USB modem */
41  +       generic_device_ids[7].idVendor = 0x0f3d;  +       generic_device_ids[7].idVendor = 0x12d1;
42  +       generic_device_ids[7].idProduct = 0x0112;  +       generic_device_ids[7].idProduct = 0x1003;
43  +       generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;  +       generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
44  +       /* Qualcomm 3G CDMA Merlin XU870 ExpressCard with PC-Card Adapter */  +       /* Audiovox Aircard */
45  +       generic_device_ids[8].idVendor = 0x1410;  +       generic_device_ids[8].idVendor = 0x0f3d;
46  +       generic_device_ids[8].idProduct = 0x1430;  +       generic_device_ids[8].idProduct = 0x0112;
47  +       generic_device_ids[8].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;  +       generic_device_ids[8].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
48    +       /* Qualcomm 3G CDMA Merlin XU870 ExpressCard with PC-Card Adapter */
49    +       generic_device_ids[9].idVendor = 0x1410;
50    +       generic_device_ids[9].idProduct = 0x1430;
51    +       generic_device_ids[9].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
52          /* register our generic driver with ourselves */          /* register our generic driver with ourselves */
53          usb_serial_register (&generic_device);          usb_serial_register (&generic_device);
54   #endif   #endif

Legend:
Removed from v.3771  
changed lines
  Added in v.3772

root@freewrt.org:443
ViewVC Help
Powered by ViewVC 1.1.20