|
|
@@ -231,8 +231,6 @@ uint16_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint1
|
|
|
// Note: 0xFF can be used with RNDIS
|
|
|
TU_VERIFY(tu_within(CDC_COMM_PROTOCOL_NONE, itf_desc->bInterfaceProtocol, CDC_COMM_PROTOCOL_ATCOMMAND_CDMA), 0);
|
|
|
|
|
|
- uint16_t len = 0;
|
|
|
-
|
|
|
// Find available interface
|
|
|
cdcd_interface_t * p_cdc = NULL;
|
|
|
uint8_t cdc_id;
|
|
|
@@ -249,13 +247,13 @@ uint16_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint1
|
|
|
//------------- Control Interface -------------//
|
|
|
p_cdc->itf_num = itf_desc->bInterfaceNumber;
|
|
|
|
|
|
+ uint16_t len = sizeof(tusb_desc_interface_t);
|
|
|
uint8_t const * p_desc = tu_desc_next( itf_desc );
|
|
|
- len = sizeof(tusb_desc_interface_t);
|
|
|
|
|
|
// Communication Functional Descriptors
|
|
|
while ( TUSB_DESC_CS_INTERFACE == tu_desc_type(p_desc) && len <= max_len )
|
|
|
{
|
|
|
- len += tu_desc_len(p_desc);
|
|
|
+ len += tu_desc_len(p_desc);
|
|
|
p_desc = tu_desc_next(p_desc);
|
|
|
}
|
|
|
|
|
|
@@ -266,7 +264,7 @@ uint16_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint1
|
|
|
|
|
|
p_cdc->ep_notif = ((tusb_desc_endpoint_t const *) p_desc)->bEndpointAddress;
|
|
|
|
|
|
- len += tu_desc_len(p_desc);
|
|
|
+ len += tu_desc_len(p_desc);
|
|
|
p_desc = tu_desc_next(p_desc);
|
|
|
}
|
|
|
|
|
|
@@ -275,12 +273,13 @@ uint16_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint1
|
|
|
(TUSB_CLASS_CDC_DATA == ((tusb_desc_interface_t const *) p_desc)->bInterfaceClass) )
|
|
|
{
|
|
|
// next to endpoint descriptor
|
|
|
+ len += tu_desc_len(p_desc);
|
|
|
p_desc = tu_desc_next(p_desc);
|
|
|
|
|
|
// Open endpoint pair
|
|
|
TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc, 2, TUSB_XFER_BULK, &p_cdc->ep_out, &p_cdc->ep_in), 0 );
|
|
|
|
|
|
- len += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
|
|
|
+ len += 2*sizeof(tusb_desc_endpoint_t);
|
|
|
}
|
|
|
|
|
|
// Prepare for incoming data
|