1 files changed, 80 insertions, 20 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 43be23a24575..db92a7fb1f7c 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -67,29 +67,89 @@ static int  option_tiocmset(struct usb_serial_port *port, struct file *file,
 static int  option_send_setup(struct usb_serial_port *port);
 /* Vendor and product IDs */
-#define OPTION_VENDOR_ID                0x0AF0
+#define OPTION_VENDOR_ID                        0x0AF0
-#define HUAWEI_VENDOR_ID                0x12D1
+#define OPTION_PRODUCT_COLT                     0x5000
-#define NOVATELWIRELESS_VENDOR_ID       0x1410
+#define OPTION_PRODUCT_RICOLA                   0x6000
-#define ANYDATA_VENDOR_ID               0x16d5
+#define OPTION_PRODUCT_RICOLA_LIGHT             0x6100
+#define OPTION_PRODUCT_RICOLA_QUAD              0x6200
-#define OPTION_PRODUCT_OLD              0x5000
+#define OPTION_PRODUCT_RICOLA_QUAD_LIGHT        0x6300
-#define OPTION_PRODUCT_FUSION           0x6000
+#define OPTION_PRODUCT_RICOLA_NDIS              0x6050
-#define OPTION_PRODUCT_FUSION2          0x6300
+#define OPTION_PRODUCT_RICOLA_NDIS_LIGHT        0x6150
-#define OPTION_PRODUCT_COBRA            0x6500
+#define OPTION_PRODUCT_RICOLA_NDIS_QUAD         0x6250
-#define OPTION_PRODUCT_COBRA2           0x6600
+#define OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT   0x6350
-#define OPTION_PRODUCT_GTMAX36          0x6701
+#define OPTION_PRODUCT_COBRA                    0x6500
-#define HUAWEI_PRODUCT_E600             0x1001
+#define OPTION_PRODUCT_COBRA_BUS                0x6501
-#define HUAWEI_PRODUCT_E220             0x1003
+#define OPTION_PRODUCT_VIPER                    0x6600
-#define NOVATELWIRELESS_PRODUCT_U740    0x1400
+#define OPTION_PRODUCT_VIPER_BUS                0x6601
-#define ANYDATA_PRODUCT_ID              0x6501
+#define OPTION_PRODUCT_GT_MAX_READY             0x6701
+#define OPTION_PRODUCT_GT_MAX                   0x6711
+#define OPTION_PRODUCT_FUJI_MODEM_LIGHT         0x6721
+#define OPTION_PRODUCT_FUJI_MODEM_GT            0x6741
+#define OPTION_PRODUCT_FUJI_MODEM_EX            0x6761
+#define OPTION_PRODUCT_FUJI_NETWORK_LIGHT       0x6731
+#define OPTION_PRODUCT_FUJI_NETWORK_GT          0x6751
+#define OPTION_PRODUCT_FUJI_NETWORK_EX          0x6771
+#define OPTION_PRODUCT_KOI_MODEM                0x6800
+#define OPTION_PRODUCT_KOI_NETWORK              0x6811
+#define OPTION_PRODUCT_SCORPION_MODEM           0x6901
+#define OPTION_PRODUCT_SCORPION_NETWORK         0x6911
+#define OPTION_PRODUCT_ETNA_MODEM               0x7001
+#define OPTION_PRODUCT_ETNA_NETWORK             0x7011
+#define OPTION_PRODUCT_ETNA_MODEM_LITE          0x7021
+#define OPTION_PRODUCT_ETNA_MODEM_GT            0x7041
+#define OPTION_PRODUCT_ETNA_MODEM_EX            0x7061
+#define OPTION_PRODUCT_ETNA_NETWORK_LITE        0x7031
+#define OPTION_PRODUCT_ETNA_NETWORK_GT          0x7051
+#define OPTION_PRODUCT_ETNA_NETWORK_EX          0x7071
+#define OPTION_PRODUCT_ETNA_KOI_MODEM           0x7100
+#define OPTION_PRODUCT_ETNA_KOI_NETWORK         0x7111
+#define HUAWEI_VENDOR_ID                        0x12D1
+#define HUAWEI_PRODUCT_E600                     0x1001
+#define HUAWEI_PRODUCT_E220                     0x1003
+#define NOVATELWIRELESS_VENDOR_ID               0x1410
+#define NOVATELWIRELESS_PRODUCT_U740            0x1400
+#define ANYDATA_VENDOR_ID                       0x16d5
+#define ANYDATA_PRODUCT_ID                      0x6501
 static struct usb_device_id option_ids[] = {
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA_BUS) },
-        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTMAX36) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_LIGHT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_NETWORK) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_NETWORK) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_LITE) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_GT) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_EX) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 43be23a24575..db92a7fb1f7c 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c
@@ -67,29 +67,89 @@ static int option_tiocmset(struct usb_serial_port port, struct file file,
67	static int option_send_setup(struct usb_serial_port *port);	67	static int option_send_setup(struct usb_serial_port *port);
68		68
69	/* Vendor and product IDs */	69	/* Vendor and product IDs */
70	#define OPTION_VENDOR_ID 0x0AF0	70	#define OPTION_VENDOR_ID 0x0AF0
71	#define HUAWEI_VENDOR_ID 0x12D1	71	#define OPTION_PRODUCT_COLT 0x5000
72	#define NOVATELWIRELESS_VENDOR_ID 0x1410	72	#define OPTION_PRODUCT_RICOLA 0x6000
73	#define ANYDATA_VENDOR_ID 0x16d5	73	#define OPTION_PRODUCT_RICOLA_LIGHT 0x6100
74		74	#define OPTION_PRODUCT_RICOLA_QUAD 0x6200
75	#define OPTION_PRODUCT_OLD 0x5000	75	#define OPTION_PRODUCT_RICOLA_QUAD_LIGHT 0x6300
76	#define OPTION_PRODUCT_FUSION 0x6000	76	#define OPTION_PRODUCT_RICOLA_NDIS 0x6050
77	#define OPTION_PRODUCT_FUSION2 0x6300	77	#define OPTION_PRODUCT_RICOLA_NDIS_LIGHT 0x6150
78	#define OPTION_PRODUCT_COBRA 0x6500	78	#define OPTION_PRODUCT_RICOLA_NDIS_QUAD 0x6250
79	#define OPTION_PRODUCT_COBRA2 0x6600	79	#define OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT 0x6350
80	#define OPTION_PRODUCT_GTMAX36 0x6701	80	#define OPTION_PRODUCT_COBRA 0x6500
81	#define HUAWEI_PRODUCT_E600 0x1001	81	#define OPTION_PRODUCT_COBRA_BUS 0x6501
82	#define HUAWEI_PRODUCT_E220 0x1003	82	#define OPTION_PRODUCT_VIPER 0x6600
83	#define NOVATELWIRELESS_PRODUCT_U740 0x1400	83	#define OPTION_PRODUCT_VIPER_BUS 0x6601
84	#define ANYDATA_PRODUCT_ID 0x6501	84	#define OPTION_PRODUCT_GT_MAX_READY 0x6701
		85	#define OPTION_PRODUCT_GT_MAX 0x6711
		86	#define OPTION_PRODUCT_FUJI_MODEM_LIGHT 0x6721
		87	#define OPTION_PRODUCT_FUJI_MODEM_GT 0x6741
		88	#define OPTION_PRODUCT_FUJI_MODEM_EX 0x6761
		89	#define OPTION_PRODUCT_FUJI_NETWORK_LIGHT 0x6731
		90	#define OPTION_PRODUCT_FUJI_NETWORK_GT 0x6751
		91	#define OPTION_PRODUCT_FUJI_NETWORK_EX 0x6771
		92	#define OPTION_PRODUCT_KOI_MODEM 0x6800
		93	#define OPTION_PRODUCT_KOI_NETWORK 0x6811
		94	#define OPTION_PRODUCT_SCORPION_MODEM 0x6901
		95	#define OPTION_PRODUCT_SCORPION_NETWORK 0x6911
		96	#define OPTION_PRODUCT_ETNA_MODEM 0x7001
		97	#define OPTION_PRODUCT_ETNA_NETWORK 0x7011
		98	#define OPTION_PRODUCT_ETNA_MODEM_LITE 0x7021
		99	#define OPTION_PRODUCT_ETNA_MODEM_GT 0x7041
		100	#define OPTION_PRODUCT_ETNA_MODEM_EX 0x7061
		101	#define OPTION_PRODUCT_ETNA_NETWORK_LITE 0x7031
		102	#define OPTION_PRODUCT_ETNA_NETWORK_GT 0x7051
		103	#define OPTION_PRODUCT_ETNA_NETWORK_EX 0x7071
		104	#define OPTION_PRODUCT_ETNA_KOI_MODEM 0x7100
		105	#define OPTION_PRODUCT_ETNA_KOI_NETWORK 0x7111
		106
		107	#define HUAWEI_VENDOR_ID 0x12D1
		108	#define HUAWEI_PRODUCT_E600 0x1001
		109	#define HUAWEI_PRODUCT_E220 0x1003
		110
		111	#define NOVATELWIRELESS_VENDOR_ID 0x1410
		112	#define NOVATELWIRELESS_PRODUCT_U740 0x1400
		113
		114	#define ANYDATA_VENDOR_ID 0x16d5
		115	#define ANYDATA_PRODUCT_ID 0x6501
85		116
86	static struct usb_device_id option_ids[] = {	117	static struct usb_device_id option_ids[] = {
87	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_OLD) },	118	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
88	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION) },	119	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
89	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },	120	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
		121	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
		122	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD_LIGHT) },
		123	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS) },
		124	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_LIGHT) },
		125	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD) },
		126	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT) },
90	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },	127	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
91	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },	128	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA_BUS) },
92	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTMAX36) },	129	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },
		130	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },
		131	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },
		132	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX) },
		133	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },
		134	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },
		135	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },
		136	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_LIGHT) },
		137	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_GT) },
		138	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_NETWORK_EX) },
		139	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },
		140	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_NETWORK) },
		141	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },
		142	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_NETWORK) },
		143	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },
		144	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK) },
		145	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },
		146	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
		147	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
		148	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_LITE) },
		149	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_GT) },
		150	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_NETWORK_EX) },
		151	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
		152	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },
93	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },	153	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
94	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },	154	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
95	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },	155	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },