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

clean up usbd auto desc

Browse Source
This commit is contained in:
hathach
2018-07-10 00:36:07 +07:00
parent 40de723d41
commit 15cd30629a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/usbd_desc.c
View File

@@ -254,7 +254,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
.bInterfaceClass = TUSB_CLASS_CDC, .bInterfaceClass = TUSB_CLASS_CDC,
.bInterfaceSubClass = CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL, .bInterfaceSubClass = CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL,
.bInterfaceProtocol = CDC_COMM_PROTOCOL_ATCOMMAND, .bInterfaceProtocol = CDC_COMM_PROTOCOL_ATCOMMAND,
.iInterface = 0x04 .iInterface = 4
}, },
.header = .header =
@@ -352,7 +352,7 @@ desc_auto_cfg_t const _desc_auto_config_struct =
.bInterfaceClass = TUSB_CLASS_MSC, .bInterfaceClass = TUSB_CLASS_MSC,
.bInterfaceSubClass = MSC_SUBCLASS_SCSI, .bInterfaceSubClass = MSC_SUBCLASS_SCSI,
.bInterfaceProtocol = MSC_PROTOCOL_BOT, .bInterfaceProtocol = MSC_PROTOCOL_BOT,
.iInterface = 0 // ITF_NUM_MSC + 3 .iInterface = 4 + CFG_TUD_CDC
}, },
.ep_out = .ep_out =

1
src/device/usbd_pvt.h
View File

@@ -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 );\ STASK_ASSERT_ERR( err );\
}\ }\
/* No need to wait for status to complete therefore */ \ /* 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);\ dcd_control_status(_rhport, _dir);\
}while(0) }while(0)