kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

clean up

This commit is contained in:
hathach 2018-06-18 14:31:15 +07:00
parent 38ac69b370
commit f8e7695fe9
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/tusb_types.h
View File

@ -211,16 +211,6 @@ enum {
INTERFACE_INVALID_NUMBER = 0xff INTERFACE_INVALID_NUMBER = 0xff
}; };
static inline uint8_t std_class_code_to_index(uint8_t std_class_code)
{
return (std_class_code <= TUSB_CLASS_AUDIO_VIDEO ) ? std_class_code :
(std_class_code == TUSB_CLASS_DIAGNOSTIC ) ? TUSB_CLASS_MAPPED_INDEX_START :
(std_class_code == TUSB_CLASS_WIRELESS_CONTROLLER ) ? TUSB_CLASS_MAPPED_INDEX_START + 1 :
(std_class_code == TUSB_CLASS_MISC ) ? TUSB_CLASS_MAPPED_INDEX_START + 2 :
(std_class_code == TUSB_CLASS_APPLICATION_SPECIFIC ) ? TUSB_CLASS_MAPPED_INDEX_START + 3 :
(std_class_code == TUSB_CLASS_VENDOR_SPECIFIC ) ? TUSB_CLASS_MAPPED_INDEX_START + 4 : 0;
}
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// STANDARD DESCRIPTORS // STANDARD DESCRIPTORS
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@ -363,7 +353,6 @@ typedef struct ATTR_PACKED
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Types /* Types
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
typedef struct ATTR_PACKED{ typedef struct ATTR_PACKED{
union { union {
struct ATTR_PACKED { struct ATTR_PACKED {

2
src/device/usbd.c
View File

@ -608,7 +608,7 @@ tusb_error_t usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* p_d
TU_ASSERT( dcd_edpt_open(rhport, p_desc_ep), TUSB_ERROR_DCD_OPEN_PIPE_FAILED ); TU_ASSERT( dcd_edpt_open(rhport, p_desc_ep), TUSB_ERROR_DCD_OPEN_PIPE_FAILED );
if ( p_desc_ep->bEndpointAddress & TUSB_DIR_IN_MASK ) if ( edpt_dir(p_desc_ep->bEndpointAddress) == TUSB_DIR_IN )
{ {
(*ep_in) = p_desc_ep->bEndpointAddress; (*ep_in) = p_desc_ep->bEndpointAddress;
}else }else

10
src/host/usbh.c
View File

@ -242,6 +242,16 @@ static inline tusb_error_t usbh_pipe_control_close(uint8_t dev_addr)
// return TUSB_INTERFACE_STATUS_BUSY; // return TUSB_INTERFACE_STATUS_BUSY;
//} //}
static inline uint8_t std_class_code_to_index(uint8_t std_class_code)
{
return (std_class_code <= TUSB_CLASS_AUDIO_VIDEO ) ? std_class_code :
(std_class_code == TUSB_CLASS_DIAGNOSTIC ) ? TUSB_CLASS_MAPPED_INDEX_START :
(std_class_code == TUSB_CLASS_WIRELESS_CONTROLLER ) ? TUSB_CLASS_MAPPED_INDEX_START + 1 :
(std_class_code == TUSB_CLASS_MISC ) ? TUSB_CLASS_MAPPED_INDEX_START + 2 :
(std_class_code == TUSB_CLASS_APPLICATION_SPECIFIC ) ? TUSB_CLASS_MAPPED_INDEX_START + 3 :
(std_class_code == TUSB_CLASS_VENDOR_SPECIFIC ) ? TUSB_CLASS_MAPPED_INDEX_START + 4 : 0;
}
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// USBH-HCD ISR/Callback API // USBH-HCD ISR/Callback API
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+