diff options
| author | hathach <[email protected]> | 2018-07-10 00:36:07 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-07-10 00:36:07 +0700 |
| commit | 15cd30629ae8cca9de14b6a73edd2310038ea28c (patch) | |
| tree | 08f27ca483bed7554201b4d65c1f0b627bd49898 /src | |
| parent | 40de723d417e253e3346b58cd2ce8b5dbf60d0ac (diff) | |
clean up usbd auto desc
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/usbd_desc.c | 4 | ||||
| -rw-r--r-- | src/device/usbd_pvt.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/device/usbd_desc.c b/src/device/usbd_desc.c index e5bb49676..5faa15d13 100644 --- a/src/device/usbd_desc.c +++ b/src/device/usbd_desc.c @@ -254,7 +254,7 @@ desc_auto_cfg_t const _desc_auto_config_struct = .bInterfaceClass = TUSB_CLASS_CDC, .bInterfaceSubClass = CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL, .bInterfaceProtocol = CDC_COMM_PROTOCOL_ATCOMMAND, - .iInterface = 0x04 + .iInterface = 4 }, .header = @@ -352,7 +352,7 @@ desc_auto_cfg_t const _desc_auto_config_struct = .bInterfaceClass = TUSB_CLASS_MSC, .bInterfaceSubClass = MSC_SUBCLASS_SCSI, .bInterfaceProtocol = MSC_PROTOCOL_BOT, - .iInterface = 0 // ITF_NUM_MSC + 3 + .iInterface = 4 + CFG_TUD_CDC }, .ep_out = diff --git a/src/device/usbd_pvt.h b/src/device/usbd_pvt.h index 8189d5811..e9b8263f5 100644 --- a/src/device/usbd_pvt.h +++ b/src/device/usbd_pvt.h @@ -68,7 +68,6 @@ tusb_error_t usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* p_d STASK_ASSERT_ERR( err );\ }\ /* No need to wait for status to complete therefore */ \ - /* status phase must not call dcd_control_complete/dcd_xfer_complete*/ \ dcd_control_status(_rhport, _dir);\ }while(0) |