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

rename usbh_edpt_open() to tuh_edpt_open()

This commit is contained in:
hathach 2022-03-19 14:59:31 +07:00
parent a4b976f095
commit 821be65b03
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/host/bare_api/src/main.c
View File

@ -234,7 +234,7 @@ void open_hid_interface(uint8_t daddr, tusb_desc_interface_t const *desc_itf, ui
if(tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN) if(tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN)
{ {
// skip if failed to open endpoint // skip if failed to open endpoint
if ( ! usbh_edpt_open(daddr, desc_ep) ) return; if ( ! tuh_edpt_open(daddr, desc_ep) ) return;
uint8_t* buf = get_hid_buf(daddr); uint8_t* buf = get_hid_buf(daddr);
if (!buf) return; // out of memory if (!buf) return; // out of memory

4
src/class/cdc/cdc_host.c
View File

@ -197,7 +197,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
// notification endpoint // notification endpoint
tusb_desc_endpoint_t const * desc_ep = (tusb_desc_endpoint_t const *) p_desc; tusb_desc_endpoint_t const * desc_ep = (tusb_desc_endpoint_t const *) p_desc;
TU_ASSERT( usbh_edpt_open(dev_addr, desc_ep) ); TU_ASSERT( tuh_edpt_open(dev_addr, desc_ep) );
p_cdc->ep_notif = desc_ep->bEndpointAddress; p_cdc->ep_notif = desc_ep->bEndpointAddress;
drv_len += tu_desc_len(p_desc); drv_len += tu_desc_len(p_desc);
@ -218,7 +218,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
tusb_desc_endpoint_t const *desc_ep = (tusb_desc_endpoint_t const *) p_desc; tusb_desc_endpoint_t const *desc_ep = (tusb_desc_endpoint_t const *) p_desc;
TU_ASSERT(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType && TUSB_XFER_BULK == desc_ep->bmAttributes.xfer); TU_ASSERT(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType && TUSB_XFER_BULK == desc_ep->bmAttributes.xfer);
TU_ASSERT(usbh_edpt_open(dev_addr, desc_ep)); TU_ASSERT(tuh_edpt_open(dev_addr, desc_ep));
if ( tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN ) if ( tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN )
{ {

2
src/class/hid/hid_host.c
View File

@ -356,7 +356,7 @@ bool hidh_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *de
for(int i = 0; i < desc_itf->bNumEndpoints; i++) for(int i = 0; i < desc_itf->bNumEndpoints; i++)
{ {
TU_ASSERT(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType); TU_ASSERT(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType);
TU_ASSERT( usbh_edpt_open(dev_addr, desc_ep) ); TU_ASSERT( tuh_edpt_open(dev_addr, desc_ep) );
if(tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN) if(tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN)
{ {

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

@ -379,7 +379,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *de
for(uint32_t i=0; i<2; i++) for(uint32_t i=0; i<2; i++)
{ {
TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType && TUSB_XFER_BULK == ep_desc->bmAttributes.xfer); TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType && TUSB_XFER_BULK == ep_desc->bmAttributes.xfer);
TU_ASSERT(usbh_edpt_open(dev_addr, ep_desc)); TU_ASSERT(tuh_edpt_open(dev_addr, ep_desc));
if ( tu_edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN ) if ( tu_edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN )
{ {

2
src/host/hub.c
View File

@ -201,7 +201,7 @@ bool hub_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *itf
TU_ASSERT(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType && TU_ASSERT(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType &&
TUSB_XFER_INTERRUPT == desc_ep->bmAttributes.xfer, 0); TUSB_XFER_INTERRUPT == desc_ep->bmAttributes.xfer, 0);
TU_ASSERT(usbh_edpt_open(dev_addr, desc_ep)); TU_ASSERT(tuh_edpt_open(dev_addr, desc_ep));
hub_interface_t* p_hub = get_itf(dev_addr); hub_interface_t* p_hub = get_itf(dev_addr);

2
src/host/usbh.c
View File

@ -806,7 +806,7 @@ static bool usbh_edpt_control_open(uint8_t dev_addr, uint8_t max_packet_size)
return hcd_edpt_open(usbh_get_rhport(dev_addr), dev_addr, &ep0_desc); return hcd_edpt_open(usbh_get_rhport(dev_addr), dev_addr, &ep0_desc);
} }
bool usbh_edpt_open(uint8_t dev_addr, tusb_desc_endpoint_t const * desc_ep) bool tuh_edpt_open(uint8_t dev_addr, tusb_desc_endpoint_t const * desc_ep)
{ {
TU_ASSERT( tu_edpt_validate(desc_ep, tuh_speed_get(dev_addr)) ); TU_ASSERT( tu_edpt_validate(desc_ep, tuh_speed_get(dev_addr)) );

4
src/host/usbh.h
View File

@ -135,8 +135,8 @@ bool tuh_control_xfer(tuh_xfer_t* xfer);
// - sync : blocking if complete callback is NULL. // - sync : blocking if complete callback is NULL.
bool tuh_edpt_xfer(tuh_xfer_t* xfer); bool tuh_edpt_xfer(tuh_xfer_t* xfer);
// Open an endpoint // Open an non-control endpoint
bool usbh_edpt_open(uint8_t dev_addr, tusb_desc_endpoint_t const * desc_ep); bool tuh_edpt_open(uint8_t dev_addr, tusb_desc_endpoint_t const * desc_ep);
// Set Configuration (control transfer) // Set Configuration (control transfer)
// config_num = 0 will un-configure device. Note: config_num = config_descriptor_index + 1 // config_num = 0 will un-configure device. Note: config_num = config_descriptor_index + 1