summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2020-05-28 13:57:49 +0700
committerhathach <[email protected]>2020-05-28 13:57:49 +0700
commitfb214f7cf792d3e8a3e1161c9797b68db71a1f68 (patch)
treea4265296dc3816c1c31f5fa8b4ad32edb8543fa3
parent10cd3f24bf0af9b7a1f357505ebbb5ef2132e34b (diff)
rename to drv_len to be consistent
-rw-r--r--src/class/cdc/cdc_device.c20
-rw-r--r--src/class/dfu/dfu_rt_device.c8
-rw-r--r--src/class/msc/msc_device.c6
3 files changed, 17 insertions, 17 deletions
diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index a8a58980a..9180065c4 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -247,14 +247,14 @@ 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);
+ uint16_t drv_len = sizeof(tusb_desc_interface_t);
uint8_t const * p_desc = tu_desc_next( itf_desc );
// Communication Functional Descriptors
- while ( TUSB_DESC_CS_INTERFACE == tu_desc_type(p_desc) && len <= max_len )
+ while ( TUSB_DESC_CS_INTERFACE == tu_desc_type(p_desc) && drv_len <= max_len )
{
- len += tu_desc_len(p_desc);
- p_desc = tu_desc_next(p_desc);
+ drv_len += tu_desc_len(p_desc);
+ p_desc = tu_desc_next(p_desc);
}
if ( TUSB_DESC_ENDPOINT == tu_desc_type(p_desc) )
@@ -264,8 +264,8 @@ 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);
- p_desc = tu_desc_next(p_desc);
+ drv_len += tu_desc_len(p_desc);
+ p_desc = tu_desc_next(p_desc);
}
//------------- Data Interface (if any) -------------//
@@ -273,19 +273,19 @@ 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);
+ drv_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 += 2*sizeof(tusb_desc_endpoint_t);
+ drv_len += 2*sizeof(tusb_desc_endpoint_t);
}
// Prepare for incoming data
_prep_out_transaction(cdc_id);
- return len;
+ return drv_len;
}
// Invoked when class request DATA stage is finished.
diff --git a/src/class/dfu/dfu_rt_device.c b/src/class/dfu/dfu_rt_device.c
index 426680e8e..01d4e3490 100644
--- a/src/class/dfu/dfu_rt_device.c
+++ b/src/class/dfu/dfu_rt_device.c
@@ -66,15 +66,15 @@ uint16_t dfu_rtd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, ui
itf_desc->bInterfaceProtocol == DFU_PROTOCOL_RT, 0);
uint8_t const * p_desc = tu_desc_next( itf_desc );
- uint16_t len = sizeof(tusb_desc_interface_t);
+ uint16_t drv_len = sizeof(tusb_desc_interface_t);
if ( TUSB_DESC_FUNCTIONAL == tu_desc_type(p_desc) )
{
- len += tu_desc_len(p_desc);
- p_desc = tu_desc_next(p_desc);
+ drv_len += tu_desc_len(p_desc);
+ p_desc = tu_desc_next(p_desc);
}
- return len;
+ return drv_len;
}
bool dfu_rtd_control_complete(uint8_t rhport, tusb_control_request_t const * request)
diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 00a5b4525..b038d00f7 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -162,10 +162,10 @@ uint16_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint1
MSC_PROTOCOL_BOT == itf_desc->bInterfaceProtocol, 0);
// msc driver length is fixed
- enum { _MSC_DRIVER_LEN = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t) };
+ uint16_t const drv_len = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
// Max length mus be at least 1 interface + 2 endpoints
- TU_ASSERT(max_len >= _MSC_DRIVER_LEN, 0);
+ TU_ASSERT(max_len >= drv_len, 0);
mscd_interface_t * p_msc = &_mscd_itf;
p_msc->itf_num = itf_desc->bInterfaceNumber;
@@ -180,7 +180,7 @@ uint16_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint1
TU_BREAKPOINT();
}
- return _MSC_DRIVER_LEN;
+ return drv_len;
}
// Handle class control request