Skip to content

Commit 149fb04

Browse files
electretmikeMichiel van Leeuwen
authored and
sakumisu
committed
fix: rename class to class_code, for c++ compatibility (#269)
Co-authored-by: Michiel van Leeuwen <[email protected]>
1 parent f437b3e commit 149fb04

21 files changed

+75
-75
lines changed

‎class/audio/usbh_audio.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -537,18 +537,18 @@ const struct usbh_class_driver audio_streaming_class_driver = {
537537

538538
CLASS_INFO_DEFINE const struct usbh_class_info audio_ctrl_intf_class_info = {
539539
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS,
540-
.class = USB_DEVICE_CLASS_AUDIO,
541-
.subclass = AUDIO_SUBCLASS_AUDIOCONTROL,
542-
.protocol = 0x00,
540+
.bInterfaceClass = USB_DEVICE_CLASS_AUDIO,
541+
.bInterfaceSubClass = AUDIO_SUBCLASS_AUDIOCONTROL,
542+
.bInterfaceProtocol = 0x00,
543543
.id_table = NULL,
544544
.class_driver = &audio_ctrl_class_driver
545545
};
546546

547547
CLASS_INFO_DEFINE const struct usbh_class_info audio_streaming_intf_class_info = {
548548
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS,
549-
.class = USB_DEVICE_CLASS_AUDIO,
550-
.subclass = AUDIO_SUBCLASS_AUDIOSTREAMING,
551-
.protocol = 0x00,
549+
.bInterfaceClass = USB_DEVICE_CLASS_AUDIO,
550+
.bInterfaceSubClass = AUDIO_SUBCLASS_AUDIOSTREAMING,
551+
.bInterfaceProtocol = 0x00,
552552
.id_table = NULL,
553553
.class_driver = &audio_streaming_class_driver
554554
};

‎class/cdc/usbh_cdc_acm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,18 +267,18 @@ const struct usbh_class_driver cdc_data_class_driver = {
267267

268268
CLASS_INFO_DEFINE const struct usbh_class_info cdc_acm_class_info = {
269269
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS,
270-
.class = USB_DEVICE_CLASS_CDC,
271-
.subclass = CDC_ABSTRACT_CONTROL_MODEL,
272-
.protocol = 0x00,
270+
.bInterfaceClass = USB_DEVICE_CLASS_CDC,
271+
.bInterfaceSubClass = CDC_ABSTRACT_CONTROL_MODEL,
272+
.bInterfaceProtocol = 0x00,
273273
.id_table = NULL,
274274
.class_driver = &cdc_acm_class_driver
275275
};
276276

277277
CLASS_INFO_DEFINE const struct usbh_class_info cdc_data_class_info = {
278278
.match_flags = USB_CLASS_MATCH_INTF_CLASS,
279-
.class = USB_DEVICE_CLASS_CDC_DATA,
280-
.subclass = 0x00,
281-
.protocol = 0x00,
279+
.bInterfaceClass = USB_DEVICE_CLASS_CDC_DATA,
280+
.bInterfaceSubClass = 0x00,
281+
.bInterfaceProtocol = 0x00,
282282
.id_table = NULL,
283283
.class_driver = &cdc_data_class_driver
284284
};

‎class/cdc/usbh_cdc_ecm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ const struct usbh_class_driver cdc_ecm_class_driver = {
323323

324324
CLASS_INFO_DEFINE const struct usbh_class_info cdc_ecm_class_info = {
325325
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
326-
.class = USB_DEVICE_CLASS_CDC,
327-
.subclass = CDC_ETHERNET_NETWORKING_CONTROL_MODEL,
328-
.protocol = CDC_COMMON_PROTOCOL_NONE,
326+
.bInterfaceClass = USB_DEVICE_CLASS_CDC,
327+
.bInterfaceSubClass = CDC_ETHERNET_NETWORKING_CONTROL_MODEL,
328+
.bInterfaceProtocol = CDC_COMMON_PROTOCOL_NONE,
329329
.id_table = NULL,
330330
.class_driver = &cdc_ecm_class_driver
331331
};

‎class/cdc/usbh_cdc_ncm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,9 @@ const struct usbh_class_driver cdc_ncm_class_driver = {
403403

404404
CLASS_INFO_DEFINE const struct usbh_class_info cdc_ncm_class_info = {
405405
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
406-
.class = USB_DEVICE_CLASS_CDC,
407-
.subclass = CDC_NETWORK_CONTROL_MODEL,
408-
.protocol = CDC_COMMON_PROTOCOL_NONE,
406+
.bInterfaceClass = USB_DEVICE_CLASS_CDC,
407+
.bInterfaceSubClass = CDC_NETWORK_CONTROL_MODEL,
408+
.bInterfaceProtocol = CDC_COMMON_PROTOCOL_NONE,
409409
.id_table = NULL,
410410
.class_driver = &cdc_ncm_class_driver
411411
};

‎class/hid/usbh_hid.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ const struct usbh_class_driver hid_class_driver = {
303303

304304
CLASS_INFO_DEFINE const struct usbh_class_info hid_custom_class_info = {
305305
.match_flags = USB_CLASS_MATCH_INTF_CLASS,
306-
.class = USB_DEVICE_CLASS_HID,
307-
.subclass = 0x00,
308-
.protocol = 0x00,
306+
.bInterfaceClass = USB_DEVICE_CLASS_HID,
307+
.bInterfaceSubClass = 0x00,
308+
.bInterfaceProtocol = 0x00,
309309
.id_table = NULL,
310310
.class_driver = &hid_class_driver
311311
};

‎class/hub/usbh_hub.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,9 @@ const struct usbh_class_driver hub_class_driver = {
734734

735735
CLASS_INFO_DEFINE const struct usbh_class_info hub_class_info = {
736736
.match_flags = USB_CLASS_MATCH_INTF_CLASS,
737-
.class = USB_DEVICE_CLASS_HUB,
738-
.subclass = 0,
739-
.protocol = 0,
737+
.bInterfaceClass = USB_DEVICE_CLASS_HUB,
738+
.bInterfaceSubClass = 0,
739+
.bInterfaceProtocol = 0,
740740
.id_table = NULL,
741741
.class_driver = &hub_class_driver
742742
};

‎class/msc/usbh_msc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,9 @@ const struct usbh_class_driver msc_class_driver = {
443443

444444
CLASS_INFO_DEFINE const struct usbh_class_info msc_class_info = {
445445
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
446-
.class = USB_DEVICE_CLASS_MASS_STORAGE,
447-
.subclass = MSC_SUBCLASS_SCSI,
448-
.protocol = MSC_PROTOCOL_BULK_ONLY,
446+
.bInterfaceClass = USB_DEVICE_CLASS_MASS_STORAGE,
447+
.bInterfaceSubClass = MSC_SUBCLASS_SCSI,
448+
.bInterfaceProtocol = MSC_PROTOCOL_BULK_ONLY,
449449
.id_table = NULL,
450450
.class_driver = &msc_class_driver
451451
};

‎class/template/usbh_xxx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ static const struct usbh_class_driver xxx_class_driver = {
8989

9090
CLASS_INFO_DEFINE const struct usbh_class_info xxx_class_info = {
9191
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
92-
.class = 0,
93-
.subclass = 0,
94-
.protocol = 0,
92+
.bInterfaceClass = 0,
93+
.bInterfaceSubClass = 0,
94+
.bInterfaceProtocol = 0,
9595
.id_table = NULL,
9696
.class_driver = &xxx_class_driver
9797
};

‎class/vendor/net/usbh_asix.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,9 +817,9 @@ static const struct usbh_class_driver asix_class_driver = {
817817

818818
CLASS_INFO_DEFINE const struct usbh_class_info asix_class_info = {
819819
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
820-
.class = 0xff,
821-
.subclass = 0x00,
822-
.protocol = 0x00,
820+
.bInterfaceClass = 0xff,
821+
.bInterfaceSubClass = 0x00,
822+
.bInterfaceProtocol = 0x00,
823823
.id_table = asix_id_table,
824824
.class_driver = &asix_class_driver
825825
};

‎class/vendor/net/usbh_rtl8152.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,9 +2272,9 @@ static const struct usbh_class_driver rtl8152_class_driver = {
22722272

22732273
CLASS_INFO_DEFINE const struct usbh_class_info rtl8152_class_info = {
22742274
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
2275-
.class = 0xff,
2276-
.subclass = 0x00,
2277-
.protocol = 0x00,
2275+
.bInterfaceClass = 0xff,
2276+
.bInterfaceSubClass = 0x00,
2277+
.bInterfaceProtocol = 0x00,
22782278
.id_table = rtl_id_table,
22792279
.class_driver = &rtl8152_class_driver
22802280
};

‎class/vendor/serial/usbh_ch34x.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@ const struct usbh_class_driver ch34x_class_driver = {
370370

371371
CLASS_INFO_DEFINE const struct usbh_class_info ch34x_class_info = {
372372
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
373-
.class = 0xff,
374-
.subclass = 0x00,
375-
.protocol = 0x00,
373+
.bInterfaceClass = 0xff,
374+
.bInterfaceSubClass = 0x00,
375+
.bInterfaceProtocol = 0x00,
376376
.id_table = ch34x_id_table,
377377
.class_driver = &ch34x_class_driver
378378
};

‎class/vendor/serial/usbh_cp210x.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ const struct usbh_class_driver cp210x_class_driver = {
319319

320320
CLASS_INFO_DEFINE const struct usbh_class_info cp210x_class_info = {
321321
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
322-
.class = 0xff,
323-
.subclass = 0x00,
324-
.protocol = 0x00,
322+
.bInterfaceClass = 0xff,
323+
.bInterfaceSubClass = 0x00,
324+
.bInterfaceProtocol = 0x00,
325325
.id_table = cp210x_id_table,
326326
.class_driver = &cp210x_class_driver
327327
};

‎class/vendor/serial/usbh_ftdi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ const struct usbh_class_driver ftdi_class_driver = {
392392

393393
CLASS_INFO_DEFINE const struct usbh_class_info ftdi_class_info = {
394394
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
395-
.class = 0xff,
396-
.subclass = 0x00,
397-
.protocol = 0x00,
395+
.bInterfaceClass = 0xff,
396+
.bInterfaceSubClass = 0x00,
397+
.bInterfaceProtocol = 0x00,
398398
.id_table = ftdi_id_table,
399399
.class_driver = &ftdi_class_driver
400400
};

‎class/vendor/serial/usbh_pl2303.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,9 @@ const struct usbh_class_driver pl2303_class_driver = {
440440

441441
CLASS_INFO_DEFINE const struct usbh_class_info pl2303_class_info = {
442442
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
443-
.class = 0xff,
444-
.subclass = 0x00,
445-
.protocol = 0x00,
443+
.bInterfaceClass = 0xff,
444+
.bInterfaceSubClass = 0x00,
445+
.bInterfaceProtocol = 0x00,
446446
.id_table = pl2303_id_table,
447447
.class_driver = &pl2303_class_driver
448448
};

‎class/vendor/wifi/usbh_bl616.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,9 @@ static const struct usbh_class_driver bl616_class_driver = {
504504

505505
CLASS_INFO_DEFINE const struct usbh_class_info bl616_class_info = {
506506
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
507-
.class = 0xff,
508-
.subclass = 0x00,
509-
.protocol = 0x00,
507+
.bInterfaceClass = 0xff,
508+
.bInterfaceSubClass = 0x00,
509+
.bInterfaceProtocol = 0x00,
510510
.id_table = bl616_id_table,
511511
.class_driver = &bl616_class_driver
512512
};

‎class/vendor/xbox/usbh_xbox.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ static const uint16_t xbox_id_table[][2] = {
220220

221221
CLASS_INFO_DEFINE const struct usbh_class_info xbox_custom_class_info = {
222222
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
223-
.class = USB_DEVICE_CLASS_VEND_SPECIFIC,
224-
.subclass = 0x5d,
225-
.protocol = 0x01,
223+
.bInterfaceClass = USB_DEVICE_CLASS_VEND_SPECIFIC,
224+
.bInterfaceSubClass = 0x5d,
225+
.bInterfaceProtocol = 0x01,
226226
.id_table = xbox_id_table,
227227
.class_driver = &xbox_class_driver
228228
};

‎class/video/usbh_video.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -531,18 +531,18 @@ const struct usbh_class_driver video_streaming_class_driver = {
531531

532532
CLASS_INFO_DEFINE const struct usbh_class_info video_ctrl_class_info = {
533533
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
534-
.class = USB_DEVICE_CLASS_VIDEO,
535-
.subclass = VIDEO_SC_VIDEOCONTROL,
536-
.protocol = VIDEO_PC_PROTOCOL_UNDEFINED,
534+
.bInterfaceClass = USB_DEVICE_CLASS_VIDEO,
535+
.bInterfaceSubClass = VIDEO_SC_VIDEOCONTROL,
536+
.bInterfaceProtocol = VIDEO_PC_PROTOCOL_UNDEFINED,
537537
.id_table = NULL,
538538
.class_driver = &video_ctrl_class_driver
539539
};
540540

541541
CLASS_INFO_DEFINE const struct usbh_class_info video_streaming_class_info = {
542542
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
543-
.class = USB_DEVICE_CLASS_VIDEO,
544-
.subclass = VIDEO_SC_VIDEOSTREAMING,
545-
.protocol = VIDEO_PC_PROTOCOL_UNDEFINED,
543+
.bInterfaceClass = USB_DEVICE_CLASS_VIDEO,
544+
.bInterfaceSubClass = VIDEO_SC_VIDEOSTREAMING,
545+
.bInterfaceProtocol = VIDEO_PC_PROTOCOL_UNDEFINED,
546546
.id_table = NULL,
547547
.class_driver = &video_streaming_class_driver
548548
};

‎class/wireless/usbh_bluetooth.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,18 +393,18 @@ static const uint16_t bluetooth_id_table[][2] = {
393393

394394
CLASS_INFO_DEFINE const struct usbh_class_info bluetooth_h4_nrf_class_info = {
395395
.match_flags = USB_CLASS_MATCH_VID_PID | USB_CLASS_MATCH_INTF_CLASS,
396-
.class = 0xff,
397-
.subclass = 0x00,
398-
.protocol = 0x00,
396+
.bInterfaceClass = 0xff,
397+
.bInterfaceSubClass = 0x00,
398+
.bInterfaceProtocol = 0x00,
399399
.id_table = bluetooth_id_table,
400400
.class_driver = &bluetooth_class_driver
401401
};
402402
#else
403403
CLASS_INFO_DEFINE const struct usbh_class_info bluetooth_class_info = {
404404
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
405-
.class = USB_DEVICE_CLASS_WIRELESS,
406-
.subclass = 0x01,
407-
.protocol = 0x01,
405+
.bInterfaceClass = USB_DEVICE_CLASS_WIRELESS,
406+
.bInterfaceSubClass = 0x01,
407+
.bInterfaceProtocol = 0x01,
408408
.id_table = NULL,
409409
.class_driver = &bluetooth_class_driver
410410
};

‎class/wireless/usbh_rndis.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,9 +600,9 @@ static const struct usbh_class_driver rndis_class_driver = {
600600

601601
CLASS_INFO_DEFINE const struct usbh_class_info rndis_class_info = {
602602
.match_flags = USB_CLASS_MATCH_INTF_CLASS | USB_CLASS_MATCH_INTF_SUBCLASS | USB_CLASS_MATCH_INTF_PROTOCOL,
603-
.class = USB_DEVICE_CLASS_WIRELESS,
604-
.subclass = 0x01,
605-
.protocol = 0x03,
603+
.bInterfaceClass = USB_DEVICE_CLASS_WIRELESS,
604+
.bInterfaceSubClass = 0x01,
605+
.bInterfaceProtocol = 0x03,
606606
.id_table = NULL,
607607
.class_driver = &rndis_class_driver
608608
};

‎core/usbh_core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ static const struct usbh_class_driver *usbh_find_class_driver(uint8_t class, uin
9393
struct usbh_class_info *index = NULL;
9494

9595
for (index = usbh_class_info_table_begin; index < usbh_class_info_table_end; index++) {
96-
if ((index->match_flags & USB_CLASS_MATCH_INTF_CLASS) && !(index->class == class)) {
96+
if ((index->match_flags & USB_CLASS_MATCH_INTF_CLASS) && !(index->bInterfaceClass == class)) {
9797
continue;
9898
}
99-
if ((index->match_flags & USB_CLASS_MATCH_INTF_SUBCLASS) && !(index->subclass == subclass)) {
99+
if ((index->match_flags & USB_CLASS_MATCH_INTF_SUBCLASS) && !(index->bInterfaceSubClass == subclass)) {
100100
continue;
101101
}
102-
if ((index->match_flags & USB_CLASS_MATCH_INTF_PROTOCOL) && !(index->protocol == protocol)) {
102+
if ((index->match_flags & USB_CLASS_MATCH_INTF_PROTOCOL) && !(index->bInterfaceProtocol == protocol)) {
103103
continue;
104104
}
105105
if (index->match_flags & USB_CLASS_MATCH_VID_PID && index->id_table) {

‎core/usbh_core.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ extern "C" {
6161

6262
struct usbh_class_info {
6363
uint8_t match_flags; /* Used for product specific matches; range is inclusive */
64-
uint8_t class; /* Base device class code */
65-
uint8_t subclass; /* Sub-class, depends on base class. Eg. */
66-
uint8_t protocol; /* Protocol, depends on base class. Eg. */
64+
uint8_t bInterfaceClass; /* Base device class code */
65+
uint8_t bInterfaceSubClass; /* Sub-class, depends on base class. Eg. */
66+
uint8_t bInterfaceProtocol; /* Protocol, depends on base class. Eg. */
6767
const uint16_t (*id_table)[2]; /* List of Vendor/Product ID pairs */
6868
const struct usbh_class_driver *class_driver;
6969
};

0 commit comments

Comments
 (0)