hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/usb/serial/usb-serial-simple.c
....@@ -38,22 +38,17 @@
3838 { USB_DEVICE(0x0a21, 0x8001) } /* MMT-7305WW */
3939 DEVICE(carelink, CARELINK_IDS);
4040
41
-/* ZIO Motherboard USB driver */
42
-#define ZIO_IDS() \
43
- { USB_DEVICE(0x1CBE, 0x0103) }
44
-DEVICE(zio, ZIO_IDS);
45
-
46
-/* Funsoft Serial USB driver */
47
-#define FUNSOFT_IDS() \
48
- { USB_DEVICE(0x1404, 0xcddc) }
49
-DEVICE(funsoft, FUNSOFT_IDS);
50
-
5141 /* Infineon Flashloader driver */
5242 #define FLASHLOADER_IDS() \
5343 { USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
5444 { USB_DEVICE(0x8087, 0x0716) }, \
5545 { USB_DEVICE(0x8087, 0x0801) }
5646 DEVICE(flashloader, FLASHLOADER_IDS);
47
+
48
+/* Funsoft Serial USB driver */
49
+#define FUNSOFT_IDS() \
50
+ { USB_DEVICE(0x1404, 0xcddc) }
51
+DEVICE(funsoft, FUNSOFT_IDS);
5752
5853 /* Google Serial USB SubClass */
5954 #define GOOGLE_IDS() \
....@@ -63,15 +58,20 @@
6358 0x01) }
6459 DEVICE(google, GOOGLE_IDS);
6560
61
+/* HP4x (48/49) Generic Serial driver */
62
+#define HP4X_IDS() \
63
+ { USB_DEVICE(0x03f0, 0x0121) }
64
+DEVICE(hp4x, HP4X_IDS);
65
+
66
+/* KAUFMANN RKS+CAN VCP */
67
+#define KAUFMANN_IDS() \
68
+ { USB_DEVICE(0x16d0, 0x0870) }
69
+DEVICE(kaufmann, KAUFMANN_IDS);
70
+
6671 /* Libtransistor USB console */
6772 #define LIBTRANSISTOR_IDS() \
6873 { USB_DEVICE(0x1209, 0x8b00) }
6974 DEVICE(libtransistor, LIBTRANSISTOR_IDS);
70
-
71
-/* ViVOpay USB Serial Driver */
72
-#define VIVOPAY_IDS() \
73
- { USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
74
-DEVICE(vivopay, VIVOPAY_IDS);
7575
7676 /* Motorola USB Phone driver */
7777 #define MOTO_IDS() \
....@@ -91,15 +91,20 @@
9191 { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */
9292 DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS);
9393
94
+/* Nokia mobile phone driver */
95
+#define NOKIA_IDS() \
96
+ { USB_DEVICE(0x0421, 0x069a) } /* Nokia 130 (RM-1035) */
97
+DEVICE(nokia, NOKIA_IDS);
98
+
9499 /* Novatel Wireless GPS driver */
95100 #define NOVATEL_IDS() \
96101 { USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */
97102 DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
98103
99
-/* HP4x (48/49) Generic Serial driver */
100
-#define HP4X_IDS() \
101
- { USB_DEVICE(0x03f0, 0x0121) }
102
-DEVICE(hp4x, HP4X_IDS);
104
+/* Siemens USB/MPI adapter */
105
+#define SIEMENS_IDS() \
106
+ { USB_DEVICE(0x908, 0x0004) }
107
+DEVICE(siemens_mpi, SIEMENS_IDS);
103108
104109 /* Suunto ANT+ USB Driver */
105110 #define SUUNTO_IDS() \
....@@ -107,43 +112,52 @@
107112 { USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */
108113 DEVICE(suunto, SUUNTO_IDS);
109114
110
-/* Siemens USB/MPI adapter */
111
-#define SIEMENS_IDS() \
112
- { USB_DEVICE(0x908, 0x0004) }
113
-DEVICE(siemens_mpi, SIEMENS_IDS);
115
+/* ViVOpay USB Serial Driver */
116
+#define VIVOPAY_IDS() \
117
+ { USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
118
+DEVICE(vivopay, VIVOPAY_IDS);
119
+
120
+/* ZIO Motherboard USB driver */
121
+#define ZIO_IDS() \
122
+ { USB_DEVICE(0x1CBE, 0x0103) }
123
+DEVICE(zio, ZIO_IDS);
114124
115125 /* All of the above structures mushed into two lists */
116126 static struct usb_serial_driver * const serial_drivers[] = {
117127 &carelink_device,
118
- &zio_device,
119
- &funsoft_device,
120128 &flashloader_device,
129
+ &funsoft_device,
121130 &google_device,
131
+ &hp4x_device,
132
+ &kaufmann_device,
122133 &libtransistor_device,
123
- &vivopay_device,
124134 &moto_modem_device,
125135 &motorola_tetra_device,
136
+ &nokia_device,
126137 &novatel_gps_device,
127
- &hp4x_device,
128
- &suunto_device,
129138 &siemens_mpi_device,
139
+ &suunto_device,
140
+ &vivopay_device,
141
+ &zio_device,
130142 NULL
131143 };
132144
133145 static const struct usb_device_id id_table[] = {
134146 CARELINK_IDS(),
135
- ZIO_IDS(),
136
- FUNSOFT_IDS(),
137147 FLASHLOADER_IDS(),
148
+ FUNSOFT_IDS(),
138149 GOOGLE_IDS(),
150
+ HP4X_IDS(),
151
+ KAUFMANN_IDS(),
139152 LIBTRANSISTOR_IDS(),
140
- VIVOPAY_IDS(),
141153 MOTO_IDS(),
142154 MOTOROLA_TETRA_IDS(),
155
+ NOKIA_IDS(),
143156 NOVATEL_IDS(),
144
- HP4X_IDS(),
145
- SUUNTO_IDS(),
146157 SIEMENS_IDS(),
158
+ SUUNTO_IDS(),
159
+ VIVOPAY_IDS(),
160
+ ZIO_IDS(),
147161 { },
148162 };
149163 MODULE_DEVICE_TABLE(usb, id_table);