andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into class-driver-id

Browse Source
This commit is contained in:
hathach
2020-04-15 10:47:49 +07:00
parent 490771a094 4ad65342e5
commit f1a6f92fab
6 changed files with 11 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/device/usbd.c
View File

@@ -222,16 +222,10 @@ static usbd_class_driver_t const _usbd_driver[] =
},
#endif
#if CFG_TUD_NET
#if CFG_TUD_NET != OPT_NET_EEM
#if CFG_TUD_NET
/* RNDIS management interface */
{
.class_code = TUD_RNDIS_ITF_CLASS,
.subclass = TUD_RNDIS_ITF_SUBCLASS,
.protocol = TUD_RNDIS_ITF_PROTOCOL,
.all_subclass = 0,
.all_protocol = 0,
.init = netd_init,
.reset = netd_reset,
.open = netd_open,
@@ -240,38 +234,20 @@ static usbd_class_driver_t const _usbd_driver[] =
.xfer_cb = netd_xfer_cb,
.sof = NULL,
},
#endif
/* CDC-ECM management interface; CDC-EEM data interface */
/* CDC-ECM management interface */
{
.class_code = TUSB_CLASS_CDC,
.subclass = CDC_COMM_SUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL,
.protocol = 0x00,
.all_subclass = 0,
.all_protocol = 0,
.init = netd_init,
.reset = netd_reset,
#if CFG_TUD_NET == OPT_NET_EEM
.open = netd_open_data,
#else
.open = netd_open,
#endif
.control_request = netd_control_request,
.control_complete = netd_control_complete,
.xfer_cb = netd_xfer_cb,
.sof = NULL,
},
/* RNDIS/CDC-ECM data interface */
#if CFG_TUD_NET != OPT_NET_EEM
{
.class_code = TUSB_CLASS_CDC_DATA,
.subclass = 0x00,
.protocol = 0x00,
.all_subclass = 0,
.all_protocol = 0,
.init = netd_init_data,
.reset = NULL,
.open = netd_open_data,
@@ -281,7 +257,6 @@ static usbd_class_driver_t const _usbd_driver[] =
.sof = NULL,
},
#endif
#endif
};
enum { USBD_CLASS_DRIVER_COUNT = TU_ARRAY_SIZE(_usbd_driver) };