diff options
| author | hathach <[email protected]> | 2020-04-15 10:47:49 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2020-04-15 10:47:49 +0700 |
| commit | f1a6f92fab471e64f0ab5c4d948bc64c9d1fe8c2 (patch) | |
| tree | e8f939ad9d8087f3f90a5a2e5a64049a8a1be86f /src/device | |
| parent | 490771a094baaa9ead60c7ea2e7c4a594d322825 (diff) | |
| parent | 4ad65342e59b7651c096f0eb6d4f5429f7f31d20 (diff) | |
Merge branch 'master' into class-driver-id
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index eea344c3b..f9c52d841 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -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) }; |