From 2351f08272882dd5c7df5936ed186bdda3bf417e Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 17 Sep 2007 15:22:12 +0000 Subject: 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 --- .../patches/220-usbserial_3g_cards.patch | 42 -------------------- .../generic-2.4/patches/802-merlin_xu870.patch | 13 ------ .../patches/802-usb_serial_3g_cards.patch | 46 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 55 deletions(-) delete mode 100644 target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch delete mode 100644 target/linux/generic-2.4/patches/802-merlin_xu870.patch create mode 100644 target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch (limited to 'target/linux/generic-2.4') diff --git a/target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch b/target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch deleted file mode 100644 index 9119b83a0e..0000000000 --- a/target/linux/generic-2.4/patches/220-usbserial_3g_cards.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- linux/drivers/usb/serial/usbserial.c.old 2006-05-15 18:16:55.000000000 +0300 -+++ linux/drivers/usb/serial/usbserial.c 2006-05-15 18:19:06.000000000 +0300 -@@ -332,7 +332,7 @@ - static __u16 vendor = 0x05f9; - static __u16 product = 0xffff; - --static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ -+static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */ - - /* All of the device info needed for the Generic Serial Converter */ - static struct usb_serial_device_type generic_device = { -@@ -1793,6 +1793,30 @@ - generic_device_ids[0].idVendor = vendor; - generic_device_ids[0].idProduct = product; - generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; -+ /* Option 3G/UMTS 'Colt' */ -+ generic_device_ids[1].idVendor = 0x0af0; -+ generic_device_ids[1].idProduct = 0x5000; -+ generic_device_ids[1].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; -+ /* Option 3G/UMTS 'Fusion' */ -+ generic_device_ids[2].idVendor = 0x0af0; -+ generic_device_ids[2].idProduct = 0x6000; -+ generic_device_ids[2].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; -+ /* Option 3G/UMTS 'Fusion2' */ -+ generic_device_ids[3].idVendor = 0x0af0; -+ generic_device_ids[3].idProduct = 0x6300; -+ 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 */ -+ generic_device_ids[5].idVendor = 0x0f3d; -+ generic_device_ids[5].idProduct = 0x0112; -+ generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; -+ /* Sierra Wireless AirCard 875 */ -+ 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; - /* register our generic driver with ourselves */ - usb_serial_register (&generic_device); - #endif diff --git a/target/linux/generic-2.4/patches/802-merlin_xu870.patch b/target/linux/generic-2.4/patches/802-merlin_xu870.patch deleted file mode 100644 index cea718f971..0000000000 --- a/target/linux/generic-2.4/patches/802-merlin_xu870.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch new file mode 100644 index 0000000000..fbbb95883c --- /dev/null +++ b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch @@ -0,0 +1,46 @@ +--- linux/drivers/usb/serial/usbserial.c.old 2006-05-15 18:16:55.000000000 +0300 ++++ linux/drivers/usb/serial/usbserial.c 2006-05-15 18:19:06.000000000 +0300 +@@ -332,7 +332,7 @@ + static __u16 vendor = 0x05f9; + static __u16 product = 0xffff; + +-static struct usb_device_id generic_device_ids[2]; /* 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 */ + static struct usb_serial_device_type generic_device = { +@@ -1793,6 +1793,34 @@ + generic_device_ids[0].idVendor = vendor; + generic_device_ids[0].idProduct = product; + generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ /* Option 3G/UMTS 'Colt' */ ++ generic_device_ids[1].idVendor = 0x0af0; ++ generic_device_ids[1].idProduct = 0x5000; ++ generic_device_ids[1].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ /* Option 3G/UMTS 'Fusion' */ ++ generic_device_ids[2].idVendor = 0x0af0; ++ generic_device_ids[2].idProduct = 0x6000; ++ generic_device_ids[2].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ /* Option 3G/UMTS 'Fusion2' */ ++ generic_device_ids[3].idVendor = 0x0af0; ++ generic_device_ids[3].idProduct = 0x6300; ++ generic_device_ids[3].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ /* Audiovox Aircard */ ++ generic_device_ids[4].idVendor = 0x0f3d; ++ generic_device_ids[4].idProduct = 0x0112; ++ generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; ++ /* Sierra Wireless AirCard 875 */ ++ generic_device_ids[5].idVendor = 0x1199; ++ 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; ++ /* 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 -- cgit v1.2.3