kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix msc host

This commit is contained in:
hathach 2018-12-10 23:15:53 +07:00
parent 212deaf2f8
commit e863c99a6f
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/class/msc/msc_host.c
View File

@ -310,7 +310,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
pipe_handle_t * p_pipe_hdl = ( ep_desc->bEndpointAddress & TUSB_DIR_IN_MASK ) ? pipe_handle_t * p_pipe_hdl = ( ep_desc->bEndpointAddress & TUSB_DIR_IN_MASK ) ?
&p_msc->bulk_in : &p_msc->bulk_out; &p_msc->bulk_in : &p_msc->bulk_out;
(*p_pipe_hdl) = hcd_pipe_open(dev_addr, ep_desc, TUSB_CLASS_MSC); (*p_pipe_hdl) = hcd_pipe_open(rhport, dev_addr, ep_desc);
TU_ASSERT( pipehandle_is_valid(*p_pipe_hdl) ); TU_ASSERT( pipehandle_is_valid(*p_pipe_hdl) );
if ( edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN ) if ( edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN )

6
src/host/ehci/ehci.c
View File

@ -829,13 +829,13 @@ static inline ehci_qtd_t* get_control_qtds(uint8_t dev_addr)
static inline ehci_qhd_t* qhd_find_free (uint8_t dev_addr) static inline ehci_qhd_t* qhd_find_free (uint8_t dev_addr)
{ {
uint8_t relative_address = dev_addr-1; uint8_t relative_addr = dev_addr-1;
uint8_t index=0; uint8_t index=0;
while( index<HCD_MAX_ENDPOINT && ehci_data.device[relative_address].qhd[index].used ) while( index<HCD_MAX_ENDPOINT && ehci_data.device[relative_addr].qhd[index].used )
{ {
index++; index++;
} }
return (index < HCD_MAX_ENDPOINT) ? &ehci_data.device[relative_address].qhd[index] : NULL; return (index < HCD_MAX_ENDPOINT) ? &ehci_data.device[relative_addr].qhd[index] : NULL;
} }
static inline uint8_t qhd_get_index(ehci_qhd_t const * p_qhd) static inline uint8_t qhd_get_index(ehci_qhd_t const * p_qhd)

50
src/host/usbh.c
View File

@ -69,51 +69,51 @@ static host_class_driver_t const usbh_class_drivers[] =
{ {
#if CFG_TUH_CDC #if CFG_TUH_CDC
{ {
.class_code = TUSB_CLASS_CDC, .class_code = TUSB_CLASS_CDC,
.init = cdch_init, .init = cdch_init,
.open = cdch_open, .open = cdch_open,
.isr = cdch_isr, .isr = cdch_isr,
.close = cdch_close .close = cdch_close
}, },
#endif #endif
#if CFG_TUH_MSC #if CFG_TUH_MSC
{ {
.class_code = TUSB_CLASS_MSC, .class_code = TUSB_CLASS_MSC,
.init = msch_init, .init = msch_init,
.open = msch_open, .open = msch_open,
.isr = msch_isr, .isr = msch_isr,
.close = msch_close .close = msch_close
}, },
#endif #endif
#if HOST_CLASS_HID #if HOST_CLASS_HID
{ {
.class_code = TUSB_CLASS_HID, .class_code = TUSB_CLASS_HID,
.init = hidh_init, .init = hidh_init,
.open = hidh_open_subtask, .open = hidh_open_subtask,
.isr = hidh_isr, .isr = hidh_isr,
.close = hidh_close .close = hidh_close
}, },
#endif #endif
#if CFG_TUH_HUB #if CFG_TUH_HUB
{ {
.class_code = TUSB_CLASS_HUB, .class_code = TUSB_CLASS_HUB,
.init = hub_init, .init = hub_init,
.open = hub_open, .open = hub_open,
.isr = hub_isr, .isr = hub_isr,
.close = hub_close .close = hub_close
}, },
#endif #endif
#if CFG_TUSB_HOST_CUSTOM_CLASS #if CFG_TUSB_HOST_CUSTOM_CLASS
{ {
.class_code = TUSB_CLASS_VENDOR_SPECIFIC, .class_code = TUSB_CLASS_VENDOR_SPECIFIC,
.init = cush_init, .init = cush_init,
.open = cush_open_subtask, .open = cush_open_subtask,
.isr = cush_isr, .isr = cush_isr,
.close = cush_close .close = cush_close
} }
#endif #endif
}; };