mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 07:00:37 +02:00
merge 3G usb serial card patches and move it at 802
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8827 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
71a4f23666
commit
cd1b974a1f
@ -1,13 +0,0 @@
|
|||||||
--- linux-2.4.34/drivers/usb/serial/usbserial.c 2007-09-07 19:15:58.000000000 +0200
|
|
||||||
+++ linux-2.4.34.new/drivers/usb/serial/usbserial.c 2007-09-09 20:19:21.000000000 +0200
|
|
||||||
@@ -1860,6 +1860,10 @@
|
|
||||||
generic_device_ids[6].idVendor = 0x1199;
|
|
||||||
generic_device_ids[6].idProduct = 0x6820;
|
|
||||||
generic_device_ids[6].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
|
||||||
+ /* Merlin XU870 */
|
|
||||||
+ generic_device_ids[7].idVendor = 0x1410;
|
|
||||||
+ generic_device_ids[7].idProduct = 0x1430;
|
|
||||||
+ generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
|
||||||
/* register our generic driver with ourselves */
|
|
||||||
usb_serial_register (&generic_device);
|
|
||||||
#endif
|
|
@ -5,11 +5,11 @@
|
|||||||
static __u16 product = 0xffff;
|
static __u16 product = 0xffff;
|
||||||
|
|
||||||
-static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
|
-static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
|
||||||
+static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */
|
+static struct usb_device_id generic_device_ids[10]; /* Initially all zeroes. */
|
||||||
|
|
||||||
/* All of the device info needed for the Generic Serial Converter */
|
/* All of the device info needed for the Generic Serial Converter */
|
||||||
static struct usb_serial_device_type generic_device = {
|
static struct usb_serial_device_type generic_device = {
|
||||||
@@ -1793,6 +1793,30 @@
|
@@ -1793,6 +1793,34 @@
|
||||||
generic_device_ids[0].idVendor = vendor;
|
generic_device_ids[0].idVendor = vendor;
|
||||||
generic_device_ids[0].idProduct = product;
|
generic_device_ids[0].idProduct = product;
|
||||||
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;
|
||||||
@ -25,18 +25,22 @@
|
|||||||
+ generic_device_ids[3].idVendor = 0x0af0;
|
+ generic_device_ids[3].idVendor = 0x0af0;
|
||||||
+ generic_device_ids[3].idProduct = 0x6300;
|
+ generic_device_ids[3].idProduct = 0x6300;
|
||||||
+ generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
+ generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
||||||
+ /* Huawei E600 */
|
|
||||||
+ generic_device_ids[4].idVendor = 0x12d1;
|
|
||||||
+ generic_device_ids[4].idProduct = 0x1001;
|
|
||||||
+ generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
|
||||||
+ /* Audiovox Aircard */
|
+ /* Audiovox Aircard */
|
||||||
+ generic_device_ids[5].idVendor = 0x0f3d;
|
+ generic_device_ids[4].idVendor = 0x0f3d;
|
||||||
+ generic_device_ids[5].idProduct = 0x0112;
|
+ generic_device_ids[4].idProduct = 0x0112;
|
||||||
+ generic_device_ids[5].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;
|
||||||
+ /* Sierra Wireless AirCard 875 */
|
+ /* Sierra Wireless AirCard 875 */
|
||||||
+ generic_device_ids[6].idVendor = 0x1199;
|
+ generic_device_ids[5].idVendor = 0x1199;
|
||||||
+ generic_device_ids[6].idProduct = 0x6820;
|
+ generic_device_ids[5].idProduct = 0x6820;
|
||||||
|
+ generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
||||||
|
+ /* Huawei E600 */
|
||||||
|
+ generic_device_ids[6].idVendor = 0x12d1;
|
||||||
|
+ generic_device_ids[6].idProduct = 0x1001;
|
||||||
+ 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;
|
||||||
|
+ /* Merlin XU870 */
|
||||||
|
+ generic_device_ids[7].idVendor = 0x1410;
|
||||||
|
+ generic_device_ids[7].idProduct = 0x1430;
|
||||||
|
+ generic_device_ids[7].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
|
||||||
/* register our generic driver with ourselves */
|
/* register our generic driver with ourselves */
|
||||||
usb_serial_register (&generic_device);
|
usb_serial_register (&generic_device);
|
||||||
#endif
|
#endif
|
Loading…
Reference in New Issue
Block a user