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

update usbtmc open()

This commit is contained in:
hathach 2020-05-28 12:13:48 +07:00
parent 13860e9f94
commit bec5b5f9da
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/class/usbtmc/usbtmc_device.c
View File

@ -260,37 +260,39 @@ void usbtmcd_init_cb(void)
usbtmcLock = osal_mutex_create(&usbtmcLockBuffer); usbtmcLock = osal_mutex_create(&usbtmcLockBuffer);
} }
bool usbtmcd_open_cb(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length) uint16_t usbtmcd_open_cb(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len)
{ {
(void)rhport; (void)rhport;
uint16_t drv_len;
uint8_t const * p_desc; uint8_t const * p_desc;
uint8_t found_endpoints = 0; uint8_t found_endpoints = 0;
TU_VERIFY(itf_desc->bInterfaceClass == TUD_USBTMC_APP_CLASS); TU_VERIFY(itf_desc->bInterfaceClass == TUD_USBTMC_APP_CLASS , 0);
TU_VERIFY(itf_desc->bInterfaceSubClass == TUD_USBTMC_APP_SUBCLASS); TU_VERIFY(itf_desc->bInterfaceSubClass == TUD_USBTMC_APP_SUBCLASS, 0);
#ifndef NDEBUG #ifndef NDEBUG
// Only 2 or 3 endpoints are allowed for USBTMC. // Only 2 or 3 endpoints are allowed for USBTMC.
TU_ASSERT((itf_desc->bNumEndpoints == 2) || (itf_desc->bNumEndpoints ==3)); TU_ASSERT((itf_desc->bNumEndpoints == 2) || (itf_desc->bNumEndpoints ==3), 0);
#endif #endif
TU_ASSERT(usbtmc_state.state == STATE_CLOSED); TU_ASSERT(usbtmc_state.state == STATE_CLOSED, 0);
// Interface // Interface
(*p_length) = 0u; drv_len = 0u;
p_desc = (uint8_t const *) itf_desc; p_desc = (uint8_t const *) itf_desc;
usbtmc_state.itf_id = itf_desc->bInterfaceNumber; usbtmc_state.itf_id = itf_desc->bInterfaceNumber;
usbtmc_state.rhport = rhport; usbtmc_state.rhport = rhport;
while (found_endpoints < itf_desc->bNumEndpoints) while (found_endpoints < itf_desc->bNumEndpoints && drv_len <= max_len)
{ {
if ( TUSB_DESC_ENDPOINT == p_desc[DESC_OFFSET_TYPE]) if ( TUSB_DESC_ENDPOINT == p_desc[DESC_OFFSET_TYPE])
{ {
tusb_desc_endpoint_t const *ep_desc = (tusb_desc_endpoint_t const *)p_desc; tusb_desc_endpoint_t const *ep_desc = (tusb_desc_endpoint_t const *)p_desc;
switch(ep_desc->bmAttributes.xfer) { switch(ep_desc->bmAttributes.xfer) {
case TUSB_XFER_BULK: case TUSB_XFER_BULK:
TU_ASSERT(ep_desc->wMaxPacketSize.size == USBTMCD_MAX_PACKET_SIZE); TU_ASSERT(ep_desc->wMaxPacketSize.size == USBTMCD_MAX_PACKET_SIZE, 0);
if (tu_edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN) if (tu_edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN)
{ {
usbtmc_state.ep_bulk_in = ep_desc->bEndpointAddress; usbtmc_state.ep_bulk_in = ep_desc->bEndpointAddress;
@ -301,45 +303,46 @@ bool usbtmcd_open_cb(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uin
break; break;
case TUSB_XFER_INTERRUPT: case TUSB_XFER_INTERRUPT:
#ifndef NDEBUG #ifndef NDEBUG
TU_ASSERT(tu_edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN); TU_ASSERT(tu_edpt_dir(ep_desc->bEndpointAddress) == TUSB_DIR_IN, 0);
TU_ASSERT(usbtmc_state.ep_int_in == 0); TU_ASSERT(usbtmc_state.ep_int_in == 0, 0);
#endif #endif
usbtmc_state.ep_int_in = ep_desc->bEndpointAddress; usbtmc_state.ep_int_in = ep_desc->bEndpointAddress;
break; break;
default: default:
TU_ASSERT(false); TU_ASSERT(false, 0);
} }
TU_VERIFY( usbd_edpt_open(rhport, ep_desc)); TU_ASSERT( usbd_edpt_open(rhport, ep_desc), 0);
found_endpoints++; found_endpoints++;
} }
(*p_length) = (uint8_t)((*p_length) + p_desc[DESC_OFFSET_LEN]);
drv_len += tu_desc_len(p_desc);
p_desc = tu_desc_next(p_desc); p_desc = tu_desc_next(p_desc);
} }
// bulk endpoints are required, but interrupt IN is optional // bulk endpoints are required, but interrupt IN is optional
#ifndef NDEBUG #ifndef NDEBUG
TU_ASSERT(usbtmc_state.ep_bulk_in != 0); TU_ASSERT(usbtmc_state.ep_bulk_in != 0, 0);
TU_ASSERT(usbtmc_state.ep_bulk_out != 0); TU_ASSERT(usbtmc_state.ep_bulk_out != 0, 0);
if (itf_desc->bNumEndpoints == 2) if (itf_desc->bNumEndpoints == 2)
{ {
TU_ASSERT(usbtmc_state.ep_int_in == 0); TU_ASSERT(usbtmc_state.ep_int_in == 0, 0);
} }
else if (itf_desc->bNumEndpoints == 3) else if (itf_desc->bNumEndpoints == 3)
{ {
TU_ASSERT(usbtmc_state.ep_int_in != 0); TU_ASSERT(usbtmc_state.ep_int_in != 0, 0);
} }
#if (CFG_TUD_USBTMC_ENABLE_488) #if (CFG_TUD_USBTMC_ENABLE_488)
if(usbtmc_state.capabilities->bmIntfcCapabilities488.is488_2 || if(usbtmc_state.capabilities->bmIntfcCapabilities488.is488_2 ||
usbtmc_state.capabilities->bmDevCapabilities488.SR1) usbtmc_state.capabilities->bmDevCapabilities488.SR1)
{ {
TU_ASSERT(usbtmc_state.ep_int_in != 0); TU_ASSERT(usbtmc_state.ep_int_in != 0, 0);
} }
#endif #endif
#endif #endif
atomicChangeState(STATE_CLOSED, STATE_NAK); atomicChangeState(STATE_CLOSED, STATE_NAK);
tud_usbtmc_open_cb(itf_desc->iInterface); tud_usbtmc_open_cb(itf_desc->iInterface);
return true; return drv_len;
} }
// Tell USBTMC class to set its bulk-in EP to ACK so that it can // Tell USBTMC class to set its bulk-in EP to ACK so that it can
// receive USBTMC commands. // receive USBTMC commands.

2
src/class/usbtmc/usbtmc_device.h
View File

@ -108,7 +108,7 @@ bool tud_usbtmc_start_bus_read(void);
/* "callbacks" from USB device core */ /* "callbacks" from USB device core */
bool usbtmcd_open_cb(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length); uint16_t usbtmcd_open_cb(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len);
void usbtmcd_reset_cb(uint8_t rhport); void usbtmcd_reset_cb(uint8_t rhport);
bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes); bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);
bool usbtmcd_control_request_cb(uint8_t rhport, tusb_control_request_t const * request); bool usbtmcd_control_request_cb(uint8_t rhport, tusb_control_request_t const * request);