shorten descriptor type

27 files changed, 85 insertions, 85 deletions

diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
index ab56135d8..c1662eb4f 100644
--- a/tinyusb/class/cdc/cdc_device.c
+++ b/tinyusb/class/cdc/cdc_device.c
@@ -130,7 +130,7 @@ void cdcd_init(void)
   }

 }

 

-tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

+tusb_error_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length)

 {

   if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass) return TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS;

 

@@ -144,7 +144,7 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
   cdcd_data_t * p_cdc = &cdcd_data[rhport];

 

   //------------- Communication Interface -------------//

-  (*p_length) = sizeof(tusb_descriptor_interface_t);

+  (*p_length) = sizeof(tusb_desc_interface_t);

 

   while( TUSB_DESC_CLASS_SPECIFIC == p_desc[DESCRIPTOR_OFFSET_TYPE] )

   { // Communication Functional Descriptors

@@ -159,9 +159,9 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
 

   if ( TUSB_DESC_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE])

   { // notification endpoint if any

-    TU_ASSERT( tusb_dcd_edpt_open(rhport, (tusb_descriptor_endpoint_t const *) p_desc), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

+    TU_ASSERT( tusb_dcd_edpt_open(rhport, (tusb_desc_endpoint_t const *) p_desc), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);

 

-    p_cdc->ep_notif = ((tusb_descriptor_endpoint_t const *) p_desc)->bEndpointAddress;

+    p_cdc->ep_notif = ((tusb_desc_endpoint_t const *) p_desc)->bEndpointAddress;

 

     (*p_length) += p_desc[DESCRIPTOR_OFFSET_LENGTH];

     p_desc = descriptor_next(p_desc);

@@ -169,7 +169,7 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
 

   //------------- Data Interface (if any) -------------//

   if ( (TUSB_DESC_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE]) &&

-       (TUSB_CLASS_CDC_DATA      == ((tusb_descriptor_interface_t const *) p_desc)->bInterfaceClass) )

+       (TUSB_CLASS_CDC_DATA      == ((tusb_desc_interface_t const *) p_desc)->bInterfaceClass) )

   {

     (*p_length) += p_desc[DESCRIPTOR_OFFSET_LENGTH];

     p_desc = descriptor_next(p_desc);

@@ -177,7 +177,7 @@ tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
     // data endpoints expected to be in pairs

     for(uint32_t i=0; i<2; i++)

     {

-      tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc;

+      tusb_desc_endpoint_t const *p_endpoint = (tusb_desc_endpoint_t const *) p_desc;

       TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType, TUSB_ERROR_DESCRIPTOR_CORRUPTED);

       TU_ASSERT(TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer, TUSB_ERROR_DESCRIPTOR_CORRUPTED);

 

diff --git a/tinyusb/class/cdc/cdc_device.h b/tinyusb/class/cdc/cdc_device.h
index c5c57c36e..9fb8cc075 100644
--- a/tinyusb/class/cdc/cdc_device.h
+++ b/tinyusb/class/cdc/cdc_device.h
@@ -90,7 +90,7 @@ void tud_cdc_rx_cb(uint8_t rhport);
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void cdcd_init(void);

-tusb_error_t cdcd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

+tusb_error_t cdcd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

 tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

 tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void cdcd_close(uint8_t rhport);

diff --git a/tinyusb/class/cdc/cdc_host.c b/tinyusb/class/cdc/cdc_host.c
index 2d39d4155..9188bb274 100644
--- a/tinyusb/class/cdc/cdc_host.c
+++ b/tinyusb/class/cdc/cdc_host.c
@@ -142,7 +142,7 @@ void cdch_init(void)
   memclr_(cdch_data, sizeof(cdch_data_t)*TUSB_CFG_HOST_DEVICE_MAX);

 }

 

-tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length)

+tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

 {

   OSAL_SUBTASK_BEGIN

   // TODO change following assert to subtask_assert

@@ -165,7 +165,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
   p_cdc->interface_protocol = p_interface_desc->bInterfaceProtocol; // TODO 0xff is consider as rndis candidate, other is virtual Com

 

   //------------- Communication Interface -------------//

-  (*p_length) = sizeof(tusb_descriptor_interface_t);

+  (*p_length) = sizeof(tusb_desc_interface_t);

 

   while( TUSB_DESC_CLASS_SPECIFIC == p_desc[DESCRIPTOR_OFFSET_TYPE] )

   { // Communication Functional Descriptors

@@ -180,7 +180,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
 

   if ( TUSB_DESC_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE])

   { // notification endpoint if any

-    p_cdc->pipe_notification = hcd_pipe_open(dev_addr, (tusb_descriptor_endpoint_t const *) p_desc, TUSB_CLASS_CDC);

+    p_cdc->pipe_notification = hcd_pipe_open(dev_addr, (tusb_desc_endpoint_t const *) p_desc, TUSB_CLASS_CDC);

 

     (*p_length) += p_desc[DESCRIPTOR_OFFSET_LENGTH];

     p_desc = descriptor_next(p_desc);

@@ -190,7 +190,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
 

   //------------- Data Interface (if any) -------------//

   if ( (TUSB_DESC_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE]) &&

-       (TUSB_CLASS_CDC_DATA      == ((tusb_descriptor_interface_t const *) p_desc)->bInterfaceClass) )

+       (TUSB_CLASS_CDC_DATA      == ((tusb_desc_interface_t const *) p_desc)->bInterfaceClass) )

   {

     (*p_length) += p_desc[DESCRIPTOR_OFFSET_LENGTH];

     p_desc = descriptor_next(p_desc);

@@ -198,7 +198,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
     // data endpoints expected to be in pairs

     for(uint32_t i=0; i<2; i++)

     {

-      tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc;

+      tusb_desc_endpoint_t const *p_endpoint = (tusb_desc_endpoint_t const *) p_desc;

       ASSERT_INT(TUSB_DESC_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED);

       ASSERT_INT(TUSB_XFER_BULK, p_endpoint->bmAttributes.xfer, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED);

 

diff --git a/tinyusb/class/cdc/cdc_host.h b/tinyusb/class/cdc/cdc_host.h
index c4585cd8b..f720cb438 100644
--- a/tinyusb/class/cdc/cdc_host.h
+++ b/tinyusb/class/cdc/cdc_host.h
@@ -150,7 +150,7 @@ typedef struct {
 extern cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX]; // TODO consider to move to cdch internal header file

 

 void         cdch_init(void);

-tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

+tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

 void         cdch_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);

 void         cdch_close(uint8_t dev_addr);

 

diff --git a/tinyusb/class/custom_class.h b/tinyusb/class/custom_class.h
index 8a774187d..ebcaf7935 100644
--- a/tinyusb/class/custom_class.h
+++ b/tinyusb/class/custom_class.h
@@ -72,7 +72,7 @@ tusb_error_t tusbh_custom_write(uint8_t dev_addr, uint16_t vendor_id, uint16_t p
 #ifdef _TINY_USB_SOURCE_FILE_
 
 void         cush_init(void);
-tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;
 void         cush_isr(pipe_handle_t pipe_hdl, tusb_event_t event);
 void         cush_close(uint8_t dev_addr);
 
diff --git a/tinyusb/class/custom_class_host.c b/tinyusb/class/custom_class_host.c
index 38d240541..2642a9ec8 100644
--- a/tinyusb/class/custom_class_host.c
+++ b/tinyusb/class/custom_class_host.c
@@ -107,7 +107,7 @@ void cush_init(void)
   memclr_(&custom_interface, sizeof(custom_interface_info_t) * TUSB_CFG_HOST_DEVICE_MAX);
 }
 
-tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length)
+tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)
 {
   // FIXME quick hack to test lpc1k custom class with 2 bulk endpoints
   uint8_t const *p_desc = (uint8_t const *) p_interface_desc;
@@ -116,7 +116,7 @@ tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
   //------------- Bulk Endpoints Descriptor -------------//
   for(uint32_t i=0; i<2; i++)
   {
-    tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc;
+    tusb_desc_endpoint_t const *p_endpoint = (tusb_desc_endpoint_t const *) p_desc;
     ASSERT_INT(TUSB_DESC_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_INVALID_PARA);
 
     pipe_handle_t * p_pipe_hdl =  ( p_endpoint->bEndpointAddress &  TUSB_DIR_IN_MASK ) ?
@@ -127,7 +127,7 @@ tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
     p_desc = descriptor_next(p_desc);
   }
 
-  (*p_length) = sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);
+  (*p_length) = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
   return TUSB_ERROR_NONE;
 }
 
diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c
index b75dfbcc5..ef4b355a0 100644
--- a/tinyusb/class/hid/hid_device.c
+++ b/tinyusb/class/hid/hid_device.c
@@ -257,7 +257,7 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
   OSAL_SUBTASK_END

 }

 

-tusb_error_t hidd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

+tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length)

 {

   uint8_t const *p_desc = (uint8_t const *) p_interface_desc;

 

@@ -268,7 +268,7 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
 

   //------------- Endpoint Descriptor -------------//

   p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH];

-  tusb_descriptor_endpoint_t const *p_desc_endpoint = (tusb_descriptor_endpoint_t const *) p_desc;

+  tusb_desc_endpoint_t const *p_desc_endpoint = (tusb_desc_endpoint_t const *) p_desc;

   ASSERT_INT(TUSB_DESC_ENDPOINT, p_desc_endpoint->bDescriptorType, TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE);

 

   if (p_interface_desc->bInterfaceSubClass == HID_SUBCLASS_BOOT)

@@ -298,7 +298,7 @@ tusb_error_t hidd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
       default: // TODO unknown, unsupported protocol --> skip this interface

         return TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE;

     }

-    *p_length = sizeof(tusb_descriptor_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_descriptor_endpoint_t);

+    *p_length = sizeof(tusb_desc_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_desc_endpoint_t);

   }else

   {

     // open generic

diff --git a/tinyusb/class/hid/hid_device.h b/tinyusb/class/hid/hid_device.h
index a97394ea5..a816a29ac 100644
--- a/tinyusb/class/hid/hid_device.h
+++ b/tinyusb/class/hid/hid_device.h
@@ -201,7 +201,7 @@ void tud_hid_mouse_set_report_cb(uint8_t rhport, hid_request_report_type_t repor
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void hidd_init(void);

-tusb_error_t hidd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

+tusb_error_t hidd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

 tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

 tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void hidd_close(uint8_t rhport);

diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c
index 20fe3270b..3c32d120a 100644
--- a/tinyusb/class/hid/hid_host.c
+++ b/tinyusb/class/hid/hid_host.c
@@ -54,7 +54,7 @@
 //--------------------------------------------------------------------+

 // HID Interface common functions

 //--------------------------------------------------------------------+

-static inline tusb_error_t hidh_interface_open(uint8_t dev_addr, uint8_t interface_number, tusb_descriptor_endpoint_t const *p_endpoint_desc, hidh_interface_info_t *p_hid)

+static inline tusb_error_t hidh_interface_open(uint8_t dev_addr, uint8_t interface_number, tusb_desc_endpoint_t const *p_endpoint_desc, hidh_interface_info_t *p_hid)

 {

   p_hid->pipe_hdl         = hcd_pipe_open(dev_addr, p_endpoint_desc, TUSB_CLASS_HID);

   p_hid->report_size      = p_endpoint_desc->wMaxPacketSize.size; // TODO get size from report descriptor

@@ -180,7 +180,7 @@ void hidh_init(void)
 TUSB_CFG_ATTR_USBRAM uint8_t report_descriptor[256];

 #endif

 

-tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length)

+tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

 {

   tusb_error_t error;

   uint8_t const *p_desc = (uint8_t const *) p_interface_desc;

@@ -192,7 +192,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
 

   //------------- Endpoint Descriptor -------------//

   p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH];

-  tusb_descriptor_endpoint_t const * p_endpoint_desc = (tusb_descriptor_endpoint_t const *) p_desc;

+  tusb_desc_endpoint_t const * p_endpoint_desc = (tusb_desc_endpoint_t const *) p_desc;

   ASSERT_INT(TUSB_DESC_ENDPOINT, p_endpoint_desc->bDescriptorType, TUSB_ERROR_INVALID_PARA);

 

   OSAL_SUBTASK_BEGIN

@@ -246,7 +246,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
     STASK_RETURN(TUSB_ERROR_HIDH_NOT_SUPPORTED_SUBCLASS); // exit & restart task

   }

 

-  *p_length = sizeof(tusb_descriptor_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_descriptor_endpoint_t);

+  *p_length = sizeof(tusb_desc_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_desc_endpoint_t);

 

   OSAL_SUBTASK_END

 }

diff --git a/tinyusb/class/hid/hid_host.h b/tinyusb/class/hid/hid_host.h
index e7094c121..c52f4b6de 100644
--- a/tinyusb/class/hid/hid_host.h
+++ b/tinyusb/class/hid/hid_host.h
@@ -216,7 +216,7 @@ typedef struct {
 }hidh_interface_info_t;

 

 void         hidh_init(void);

-tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

+tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

 void         hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);

 void         hidh_close(uint8_t dev_addr);

 

diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index e3ccd038e..5b04b14ec 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -98,7 +98,7 @@ void mscd_close(uint8_t rhport)
   memclr_(&mscd_data, sizeof(mscd_interface_t));

 }

 

-tusb_error_t mscd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length)

+tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length)

 {

   VERIFY( ( MSC_SUBCLASS_SCSI == p_interface_desc->bInterfaceSubClass &&

             MSC_PROTOCOL_BOT  == p_interface_desc->bInterfaceProtocol ), TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL );

@@ -106,7 +106,7 @@ tusb_error_t mscd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
   mscd_interface_t * p_msc = &mscd_data;

 

   //------------- Open Data Pipe -------------//

-  tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

+  tusb_desc_endpoint_t const *p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

   for(int i=0; i<2; i++)

   {

     TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType &&

@@ -122,12 +122,12 @@ tusb_error_t mscd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_int
       p_msc->ep_out = p_endpoint->bEndpointAddress;

     }

 

-    p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*)  p_endpoint );

+    p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*)  p_endpoint );

   }

 

   p_msc->interface_num = p_interface_desc->bInterfaceNumber;

 

-  (*p_length) += sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);

+  (*p_length) += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);

 

   //------------- Queue Endpoint OUT for Command Block Wrapper -------------//

   TU_ASSERT( tusb_dcd_edpt_xfer(rhport, p_msc->ep_out, (uint8_t*) &p_msc->cbw, sizeof(msc_cbw_t)), TUSB_ERROR_DCD_EDPT_XFER );

diff --git a/tinyusb/class/msc/msc_device.h b/tinyusb/class/msc/msc_device.h
index 56f5d06d5..8176e7ea6 100644
--- a/tinyusb/class/msc/msc_device.h
+++ b/tinyusb/class/msc/msc_device.h
@@ -122,7 +122,7 @@ msc_csw_status_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void mscd_init(void);

-tusb_error_t mscd_open(uint8_t rhport, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);

+tusb_error_t mscd_open(uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

 tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);

 tusb_error_t mscd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);

 void mscd_close(uint8_t rhport);

diff --git a/tinyusb/class/msc/msc_host.c b/tinyusb/class/msc/msc_host.c
index 149340342..37a243a20 100644
--- a/tinyusb/class/msc/msc_host.c
+++ b/tinyusb/class/msc/msc_host.c
@@ -292,7 +292,7 @@ void msch_init(void)
   msch_sem_hdl = osal_semaphore_create(1, 0);

 }

 

-tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length)

+tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

 {

   tusb_error_t error;

 

@@ -305,8 +305,8 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
   }

 

   //------------- Open Data Pipe -------------//

-  tusb_descriptor_endpoint_t const *p_endpoint;

-  p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

+  tusb_desc_endpoint_t const *p_endpoint;

+  p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

 

   for(uint32_t i=0; i<2; i++)

   {

@@ -319,11 +319,11 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
     (*p_pipe_hdl) = hcd_pipe_open(dev_addr, p_endpoint, TUSB_CLASS_MSC);

     STASK_ASSERT( pipehandle_is_valid(*p_pipe_hdl) );

 

-    p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*)  p_endpoint );

+    p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*)  p_endpoint );

   }

 

   msch_data[dev_addr-1].interface_number = p_interface_desc->bInterfaceNumber;

-  (*p_length) += sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t);

+  (*p_length) += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);

 

 

   //------------- Get Max Lun -------------//

diff --git a/tinyusb/class/msc/msc_host.h b/tinyusb/class/msc/msc_host.h
index 0416cf757..049db97ce 100644
--- a/tinyusb/class/msc/msc_host.h
+++ b/tinyusb/class/msc/msc_host.h
@@ -204,7 +204,7 @@ typedef struct {
 }msch_interface_t;

 

 void         msch_init(void);

-tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

+tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

 void         msch_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);

 void         msch_close(uint8_t dev_addr);

 #endif

diff --git a/tinyusb/common/std_descriptors.h b/tinyusb/common/std_descriptors.h
index c036871ed..674fc3429 100644
--- a/tinyusb/common/std_descriptors.h
+++ b/tinyusb/common/std_descriptors.h
@@ -77,7 +77,7 @@ typedef struct ATTR_PACKED
   uint8_t  iSerialNumber      ; ///< Index of string descriptor describing the device's serial number.

 

   uint8_t  bNumConfigurations ; ///< Number of possible configurations.

-} tusb_descriptor_device_t;

+} tusb_desc_device_t;

 

 /// USB Standard Configuration Descriptor (section 9.6.1 table 9-10) */

 typedef struct ATTR_PACKED

@@ -91,7 +91,7 @@ typedef struct ATTR_PACKED
   uint8_t  iConfiguration      ; ///< Index of string descriptor describing this configuration

   uint8_t  bmAttributes        ; ///< Configuration characteristics \n D7: Reserved (set to one)\n D6: Self-powered \n D5: Remote Wakeup \n D4...0: Reserved (reset to zero) \n D7 is reserved and must be set to one for historical reasons. \n A device configuration that uses power from the bus and a local source reports a non-zero value in bMaxPower to indicate the amount of bus power required and sets D6. The actual power source at runtime may be determined using the GetStatus(DEVICE) request (see USB 2.0 spec Section 9.4.5). \n If a device configuration supports remote wakeup, D5 is set to one.

   uint8_t  bMaxPower           ; ///< Maximum power consumption of the USB device from the bus in this specific configuration when the device is fully operational. Expressed in 2 mA units (i.e., 50 = 100 mA).

-} tusb_descriptor_configuration_t;

+} tusb_desc_configuration_t;

 

 /// USB Standard Interface Descriptor (section 9.6.1 table 9-12)

 typedef struct ATTR_PACKED

@@ -106,7 +106,7 @@ typedef struct ATTR_PACKED
   uint8_t  bInterfaceSubClass ; ///< Subclass code (assigned by the USB-IF). \n These codes are qualified by the value of the bInterfaceClass field. \li If the bInterfaceClass field is reset to zero, this field must also be reset to zero. \li If the bInterfaceClass field is not set to FFH, all values are reserved for assignment by the USB-IF.

   uint8_t  bInterfaceProtocol ; ///< Protocol code (assigned by the USB). \n These codes are qualified by the value of the bInterfaceClass and the bInterfaceSubClass fields. If an interface supports class-specific requests, this code identifies the protocols that the device uses as defined by the specification of the device class. \li If this field is reset to zero, the device does not use a class-specific protocol on this interface. \li If this field is set to FFH, the device uses a vendor-specific protocol for this interface.

   uint8_t  iInterface         ; ///< Index of string descriptor describing this interface

-} tusb_descriptor_interface_t;

+} tusb_desc_interface_t;

 

 /// USB Standard Endpoint Descriptor (section 9.6.1 table 9-13)

 typedef struct ATTR_PACKED

@@ -130,7 +130,7 @@ typedef struct ATTR_PACKED
   }wMaxPacketSize;

 

   uint8_t  bInterval        ; ///< Interval for polling endpoint for data transfers. Expressed in frames or microframes depending on the device operating speed (i.e., either 1 millisecond or 125 us units). \n- For full-/high-speed isochronous endpoints, this value must be in the range from 1 to 16. The bInterval value is used as the exponent for a \f$ 2^(bInterval-1) \f$ value; e.g., a bInterval of 4 means a period of 8 (\f$ 2^(4-1) \f$). \n- For full-/low-speed interrupt endpoints, the value of this field may be from 1 to 255. \n- For high-speed interrupt endpoints, the bInterval value is used as the exponent for a \f$ 2^(bInterval-1) \f$ value; e.g., a bInterval of 4 means a period of 8 (\f$ 2^(4-1) \f$) . This value must be from 1 to 16. \n- For high-speed bulk/control OUT endpoints, the bInterval must specify the maximum NAK rate of the endpoint. A value of 0 indicates the endpoint never NAKs. Other values indicate at most 1 NAK each bInterval number of microframes. This value must be in the range from 0 to 255. \n Refer to Chapter 5 of USB 2.0 specification for more information.

-} tusb_descriptor_endpoint_t;

+} tusb_desc_endpoint_t;

 

 /// USB Other Speed Configuration Descriptor (section 9.6.1 table 9-11)

 typedef struct ATTR_PACKED

@@ -144,7 +144,7 @@ typedef struct ATTR_PACKED
   uint8_t  IConfiguration      ; ///< Index of string descriptor

   uint8_t  bmAttributes        ; ///< Same as Configuration descriptor

   uint8_t  bMaxPower           ; ///< Same as Configuration descriptor

-} tusb_descriptor_other_speed_t;

+} tusb_desc_other_speed_t;

 

 /// USB Device Qualifier Descriptor (section 9.6.1 table 9-9)

 typedef struct ATTR_PACKED

@@ -159,7 +159,7 @@ typedef struct ATTR_PACKED
   uint8_t  bMaxPacketSize0    ; ///< Maximum packet size for other speed

   uint8_t  bNumConfigurations ; ///< Number of Other-speed Configurations

   uint8_t  bReserved          ; ///< Reserved for future use, must be zero

-} tusb_descriptor_device_qualifier_t;

+} tusb_desc_device_qualifier_t;

 

 /// USB Interface Association Descriptor (IAD ECN)

 typedef struct ATTR_PACKED

@@ -175,21 +175,21 @@ typedef struct ATTR_PACKED
   uint8_t bFunctionProtocol ; ///< Interface protocol ID.

 

   uint8_t iFunction         ; ///< Index of the string descriptor describing the interface association.

-} tusb_descriptor_interface_association_t;

+} tusb_desc_interface_assoc_t;

 

 /// USB Header Descriptor

 typedef struct ATTR_PACKED

 {

   uint8_t  bLength         ; ///< Size of this descriptor in bytes

   uint8_t  bDescriptorType ; ///< Descriptor Type

-} tusb_descriptor_header_t;

+} tusb_desc_header_t;

 

 typedef struct ATTR_PACKED

 {

   uint8_t  bLength         ; ///< Size of this descriptor in bytes

   uint8_t  bDescriptorType ; ///< Descriptor Type

   uint16_t unicode_string[];

-} tusb_descriptor_string_t;

+} tusb_desc_string_t;

 

 #ifdef __cplusplus

  }

diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 97e6821ea..759977cf2 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -102,9 +102,9 @@ enum { USBD_CLASS_DRIVER_COUNT = sizeof(usbd_class_drivers) / sizeof(usbd_class_
 

 

 

-//tusb_descriptor_device_qualifier_t _device_qual =

+//tusb_desc_device_qualifier_t _device_qual =

 //{

-//    .bLength = sizeof(tusb_descriptor_device_qualifier_t),

+//    .bLength = sizeof(tusb_desc_device_qualifier_t),

 //    .bDescriptorType = TUSB_DESC_DEVICE_QUALIFIER,

 //    .bcdUSB = 0x0200,

 //    .bDeviceClass =

@@ -404,9 +404,9 @@ static tusb_error_t proc_set_config_req(uint8_t rhport, uint8_t config_number)
 

   //------------- parse configuration & open drivers -------------//

   uint8_t const * p_desc_config = tusbd_descriptor_pointers.p_configuration;

-  uint8_t const * p_desc = p_desc_config + sizeof(tusb_descriptor_configuration_t);

+  uint8_t const * p_desc = p_desc_config + sizeof(tusb_desc_configuration_t);

 

-  uint16_t const config_total_length = ((tusb_descriptor_configuration_t*)p_desc_config)->wTotalLength;

+  uint16_t const config_total_length = ((tusb_desc_configuration_t*)p_desc_config)->wTotalLength;

 

   while( p_desc < p_desc_config + config_total_length )

   {

@@ -418,7 +418,7 @@ static tusb_error_t proc_set_config_req(uint8_t rhport, uint8_t config_number)
       ASSERT( TUSB_DESC_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_NOT_SUPPORTED_YET );

 

       uint8_t class_index;

-      tusb_descriptor_interface_t* p_desc_interface = (tusb_descriptor_interface_t*) p_desc;

+      tusb_desc_interface_t* p_desc_interface = (tusb_desc_interface_t*) p_desc;

 

       class_index = p_desc_interface->bInterfaceClass;

 

@@ -430,7 +430,7 @@ static tusb_error_t proc_set_config_req(uint8_t rhport, uint8_t config_number)
       uint16_t length=0;

       ASSERT_STATUS( usbd_class_drivers[class_index].open( rhport, p_desc_interface, &length ) );

 

-      ASSERT( length >= sizeof(tusb_descriptor_interface_t), TUSB_ERROR_FAILED );

+      ASSERT( length >= sizeof(tusb_desc_interface_t), TUSB_ERROR_FAILED );

       p_desc += length;

     }

   }

@@ -453,12 +453,12 @@ static uint16_t get_descriptor(uint8_t rhport, tusb_control_request_t const * co
   {

     case TUSB_DESC_DEVICE:

       desc_data = tusbd_descriptor_pointers.p_device;

-      len       = sizeof(tusb_descriptor_device_t);

+      len       = sizeof(tusb_desc_device_t);

     break;

 

     case TUSB_DESC_CONFIGURATION:

       desc_data = tusbd_descriptor_pointers.p_configuration;

-      len       = ((tusb_descriptor_configuration_t*)tusbd_descriptor_pointers.p_configuration)->wTotalLength;

+      len       = ((tusb_desc_configuration_t*)tusbd_descriptor_pointers.p_configuration)->wTotalLength;

     break;

 

     case TUSB_DESC_STRING:

diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h
index ae8ca3a8c..66ffb9b2a 100644
--- a/tinyusb/device/usbd.h
+++ b/tinyusb/device/usbd.h
@@ -59,8 +59,8 @@
 

 /// \brief Descriptor pointer collector to all the needed.

 typedef struct {

-  uint8_t const * p_device;              ///< pointer to device descritpor \ref tusb_descriptor_device_t

-  uint8_t const * p_configuration;       ///< pointer to the whole configuration descriptor, starting by \ref tusb_descriptor_configuration_t

+  uint8_t const * p_device;              ///< pointer to device descritpor \ref tusb_desc_device_t

+  uint8_t const * p_configuration;       ///< pointer to the whole configuration descriptor, starting by \ref tusb_desc_configuration_t

   uint8_t const** p_string_arr;          ///< a array of pointers to string descriptors

 

   uint8_t const * p_hid_keyboard_report; ///< pointer to HID report descriptor of Keybaord interface. Only needed if TUSB_CFG_DEVICE_HID_KEYBOARD is enabled

@@ -72,7 +72,7 @@ extern tusbd_descriptor_pointer_t tusbd_descriptor_pointers;
 

 typedef struct {

   void (* init) (void);

-  tusb_error_t (* open)(uint8_t rhport, tusb_descriptor_interface_t const * desc_intf, uint16_t* p_length);

+  tusb_error_t (* open)(uint8_t rhport, tusb_desc_interface_t const * desc_intf, uint16_t* p_length);

   tusb_error_t (* control_request_st) (uint8_t rhport, tusb_control_request_t const *);

   tusb_error_t (* xfer_cb) (uint8_t rhport, uint8_t ep_addr, tusb_event_t, uint32_t);

 //  void (* routine)(void);

diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index e107b11c8..e0abeb331 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -357,7 +357,7 @@ tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr)
 //--------------------------------------------------------------------+

 // BULK/INT/ISO PIPE API

 //--------------------------------------------------------------------+

-pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

+pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_desc_endpoint_t const * p_endpoint_desc, uint8_t class_code)

 {

   pipe_handle_t const null_handle = { .dev_addr = 0, .xfer_type = 0, .index = 0 };

 

diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 2b27cc127..a7f412cbf 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -95,7 +95,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) A
 tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;

 tusb_error_t  hcd_pipe_control_close(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;

 

-pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * endpoint_desc, uint8_t class_code) ATTR_WARN_UNUSED_RESULT;

+pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_desc_endpoint_t const * endpoint_desc, uint8_t class_code) ATTR_WARN_UNUSED_RESULT;

 tusb_error_t  hcd_pipe_queue_xfer(pipe_handle_t pipe_hdl, uint8_t buffer[], uint16_t total_bytes) ATTR_WARN_UNUSED_RESULT; // only queue, not transferring yet

 tusb_error_t  hcd_pipe_xfer(pipe_handle_t pipe_hdl, uint8_t buffer[], uint16_t total_bytes, bool int_on_complete)  ATTR_WARN_UNUSED_RESULT;

 tusb_error_t  hcd_pipe_close(pipe_handle_t pipe_hdl) /*ATTR_WARN_UNUSED_RESULT*/;

diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c
index 7034c02bf..6432ff62b 100644
--- a/tinyusb/host/hub.c
+++ b/tinyusb/host/hub.c
@@ -156,7 +156,7 @@ void hub_init(void)
 //  hub_enum_sem_hdl = osal_semaphore_create( OSAL_SEM_REF(hub_enum_semaphore) );

 }

 

-tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length)

+tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

 {

   tusb_error_t error;

 

@@ -166,8 +166,8 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t cons
   if ( p_interface_desc->bInterfaceProtocol > 1 ) return TUSB_ERROR_HUB_FEATURE_NOT_SUPPORTED;

 

   //------------- Open Interrupt Status Pipe -------------//

-  tusb_descriptor_endpoint_t const *p_endpoint;

-  p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

+  tusb_desc_endpoint_t const *p_endpoint;

+  p_endpoint = (tusb_desc_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc );

   

   STASK_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType);

   STASK_ASSERT(TUSB_XFER_INTERRUPT == p_endpoint->bmAttributes.xfer);

@@ -176,7 +176,7 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t cons
   STASK_ASSERT( pipehandle_is_valid(hub_data[dev_addr-1].pipe_status) );

   hub_data[dev_addr-1].interface_number = p_interface_desc->bInterfaceNumber;

 

-  (*p_length) = sizeof(tusb_descriptor_interface_t) + sizeof(tusb_descriptor_endpoint_t);

+  (*p_length) = sizeof(tusb_desc_interface_t) + sizeof(tusb_desc_endpoint_t);

 

   //------------- Get Hub Descriptor -------------//

   STASK_INVOKE(

diff --git a/tinyusb/host/hub.h b/tinyusb/host/hub.h
index 512d14742..fb7c74e3d 100644
--- a/tinyusb/host/hub.h
+++ b/tinyusb/host/hub.h
@@ -195,7 +195,7 @@ tusb_error_t hub_status_pipe_queue(uint8_t dev_addr);
 #ifdef _TINY_USB_SOURCE_FILE_

 

 void         hub_init(void);

-tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

+tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

 void         hub_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes);

 void         hub_close(uint8_t dev_addr);

 

diff --git a/tinyusb/host/ohci/ohci.c b/tinyusb/host/ohci/ohci.c
index 7395730f3..f5cff4e87 100644
--- a/tinyusb/host/ohci/ohci.c
+++ b/tinyusb/host/ohci/ohci.c
@@ -417,7 +417,7 @@ static void ed_list_remove(ohci_ed_t * p_head, ohci_ed_t * p_ed)
   p_ed->used      = 0; // free ED

 }

 

-pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

+pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_desc_endpoint_t const * p_endpoint_desc, uint8_t class_code)

 {

   pipe_handle_t const null_handle = { .dev_addr = 0, .xfer_type = 0, .index = 0 };

 

diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 6a2ccfb2a..c6e9256f9 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -121,7 +121,7 @@ TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t enum_data_buffer[TUSB_CF
 

 //------------- Helper Function Prototypes -------------//

 static inline uint8_t get_new_address(void) ATTR_ALWAYS_INLINE;

-static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t* dev_desc) ATTR_ALWAYS_INLINE;

+static inline uint8_t get_configure_number_for_device(tusb_desc_device_t* dev_desc) ATTR_ALWAYS_INLINE;

 

 //--------------------------------------------------------------------+

 // PUBLIC API (Parameter Verification is required)

@@ -500,7 +500,7 @@ tusb_error_t enumeration_body_subtask(void)
   usbh_devices[0].state = TUSB_DEVICE_STATE_UNPLUG;

 

   // open control pipe for new address

-  STASK_ASSERT_STATUS ( usbh_pipe_control_open(new_addr, ((tusb_descriptor_device_t*) enum_data_buffer)->bMaxPacketSize0 ) );

+  STASK_ASSERT_STATUS ( usbh_pipe_control_open(new_addr, ((tusb_desc_device_t*) enum_data_buffer)->bMaxPacketSize0 ) );

 

   //------------- Get full device descriptor -------------//

   STASK_INVOKE(

@@ -512,11 +512,11 @@ tusb_error_t enumeration_body_subtask(void)
   STASK_ASSERT_STATUS(error);

 

   // update device info  TODO alignment issue

-  usbh_devices[new_addr].vendor_id       = ((tusb_descriptor_device_t*) enum_data_buffer)->idVendor;

-  usbh_devices[new_addr].product_id      = ((tusb_descriptor_device_t*) enum_data_buffer)->idProduct;

-  usbh_devices[new_addr].configure_count = ((tusb_descriptor_device_t*) enum_data_buffer)->bNumConfigurations;

+  usbh_devices[new_addr].vendor_id       = ((tusb_desc_device_t*) enum_data_buffer)->idVendor;

+  usbh_devices[new_addr].product_id      = ((tusb_desc_device_t*) enum_data_buffer)->idProduct;

+  usbh_devices[new_addr].configure_count = ((tusb_desc_device_t*) enum_data_buffer)->bNumConfigurations;

 

-  configure_selected = get_configure_number_for_device((tusb_descriptor_device_t*) enum_data_buffer);

+  configure_selected = get_configure_number_for_device((tusb_desc_device_t*) enum_data_buffer);

   STASK_ASSERT(configure_selected <= usbh_devices[new_addr].configure_count); // TODO notify application when invalid configuration

 

   //------------- Get 9 bytes of configuration descriptor -------------//

@@ -527,7 +527,7 @@ tusb_error_t enumeration_body_subtask(void)
       error

   );

   STASK_ASSERT_STATUS(error);

-  STASK_ASSERT_HDLR( TUSB_CFG_HOST_ENUM_BUFFER_SIZE >= ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength,

+  STASK_ASSERT_HDLR( TUSB_CFG_HOST_ENUM_BUFFER_SIZE >= ((tusb_desc_configuration_t*)enum_data_buffer)->wTotalLength,

                             tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );

 

   //------------- Get full configuration descriptor -------------//

@@ -540,7 +540,7 @@ tusb_error_t enumeration_body_subtask(void)
   STASK_ASSERT_STATUS(error);

 

   // update configuration info

-  usbh_devices[new_addr].interface_count = ((tusb_descriptor_configuration_t*) enum_data_buffer)->bNumInterfaces;

+  usbh_devices[new_addr].interface_count = ((tusb_desc_configuration_t*) enum_data_buffer)->bNumInterfaces;

 

   //------------- Set Configure -------------//

   STASK_INVOKE(

@@ -556,10 +556,10 @@ tusb_error_t enumeration_body_subtask(void)
   //------------- TODO Get String Descriptors -------------//

 

   //------------- parse configuration & install drivers -------------//

-  p_desc = enum_data_buffer + sizeof(tusb_descriptor_configuration_t);

+  p_desc = enum_data_buffer + sizeof(tusb_desc_configuration_t);

 

   // parse each interfaces

-  while( p_desc < enum_data_buffer + ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength )

+  while( p_desc < enum_data_buffer + ((tusb_desc_configuration_t*)enum_data_buffer)->wTotalLength )

   {

     // skip until we see interface descriptor

     if ( TUSB_DESC_INTERFACE != p_desc[DESCRIPTOR_OFFSET_TYPE] )

@@ -569,7 +569,7 @@ tusb_error_t enumeration_body_subtask(void)
     {

       static uint8_t class_index; // has to be static as it is used to call class's open_subtask

 

-      class_index = std_class_code_to_index( ((tusb_descriptor_interface_t*) p_desc)->bInterfaceClass );

+      class_index = std_class_code_to_index( ((tusb_desc_interface_t*) p_desc)->bInterfaceClass );

       STASK_ASSERT( class_index != 0 ); // class_index == 0 means corrupted data, abort enumeration

 

       if (usbh_class_drivers[class_index].open_subtask &&

@@ -579,13 +579,13 @@ tusb_error_t enumeration_body_subtask(void)
         length = 0;

 

         STASK_INVOKE ( // parameters in task/sub_task must be static storage (static or global)

-            usbh_class_drivers[class_index].open_subtask( new_addr, (tusb_descriptor_interface_t*) p_desc, &length ),

+            usbh_class_drivers[class_index].open_subtask( new_addr, (tusb_desc_interface_t*) p_desc, &length ),

             error

         );

 

         if (error == TUSB_ERROR_NONE)

         {

-          STASK_ASSERT( length >= sizeof(tusb_descriptor_interface_t) );

+          STASK_ASSERT( length >= sizeof(tusb_desc_interface_t) );

           usbh_devices[new_addr].flag_supported_class |= BIT_(class_index);

           p_desc += length;

         }else  // Interface open failed, for example a subclass is not supported

@@ -626,7 +626,7 @@ static inline uint8_t get_new_address(void)
   return addr;

 }

 

-static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t* dev_desc)

+static inline uint8_t get_configure_number_for_device(tusb_desc_device_t* dev_desc)

 {

   uint8_t config_num = 1;

 

diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index d7610888e..5aaeb4186 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -65,7 +65,7 @@ typedef enum tusb_interface_status_{
 
 typedef struct {
   void (* const init) (void);
-  tusb_error_t (* const open_subtask)(uint8_t, tusb_descriptor_interface_t const *, uint16_t*);
+  tusb_error_t (* const open_subtask)(uint8_t, tusb_desc_interface_t const *, uint16_t*);
   void (* const isr) (pipe_handle_t, tusb_event_t, uint32_t);
   void (* const close) (uint8_t);
 } host_class_driver_t;
@@ -88,9 +88,9 @@ uint32_t tuh_device_get_mounted_class_flag(uint8_t dev_addr);
 //--------------------------------------------------------------------+
 // APPLICATION CALLBACK
 //--------------------------------------------------------------------+
-ATTR_WEAK uint8_t tuh_device_attached_cb (tusb_descriptor_device_t const *p_desc_device)  ATTR_WARN_UNUSED_RESULT;
+ATTR_WEAK uint8_t tuh_device_attached_cb (tusb_desc_device_t const *p_desc_device)  ATTR_WARN_UNUSED_RESULT;
 ATTR_WEAK void    tuh_device_mount_succeed_cb (uint8_t dev_addr);
-ATTR_WEAK void    tuh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_device_t const *p_desc_device); // TODO refractor remove desc_device
+ATTR_WEAK void    tuh_device_mount_failed_cb(tusb_error_t error, tusb_desc_device_t const *p_desc_device); // TODO refractor remove desc_device
 
 //--------------------------------------------------------------------+
 // CLASS-USBH & INTERNAL API
diff --git a/tinyusb/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c b/tinyusb/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
index 08bfa07f8..44a12b2e6 100644
--- a/tinyusb/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
+++ b/tinyusb/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
@@ -458,7 +458,7 @@ void tusb_dcd_edpt_clear_stall(uint8_t rhport, uint8_t edpt_addr)
   }

 }

 

-edpt_hdl_t tusb_dcd_edpt_open(uint8_t rhport, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

+edpt_hdl_t tusb_dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc, uint8_t class_code)

 {

   (void) rhport;

   edpt_hdl_t const null_handle = { 0 };

diff --git a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c
index 212a54f2c..ac1aadd8c 100644
--- a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c
+++ b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c
@@ -414,7 +414,7 @@ bool tusb_dcd_control_xfer(uint8_t rhport, tusb_dir_t dir, uint8_t * p_buffer, u
 //--------------------------------------------------------------------+

 // BULK/INTERRUPT/ISO PIPE API

 //--------------------------------------------------------------------+

-edpt_hdl_t tusb_dcd_edpt_open(uint8_t rhport, tusb_descriptor_endpoint_t const * p_endpoint_desc, uint8_t class_code)

+edpt_hdl_t tusb_dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc, uint8_t class_code)

 {

   (void) rhport;

 

diff --git a/tinyusb/tusb_dcd.h b/tinyusb/tusb_dcd.h
index a859c7cdd..4765f0465 100644
--- a/tinyusb/tusb_dcd.h
+++ b/tinyusb/tusb_dcd.h
@@ -88,7 +88,7 @@ static inline void tusb_dcd_control_complete(uint8_t rhport)
 bool tusb_dcd_control_xfer     (uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);

 

 //------------- Other Endpoints -------------//

-bool tusb_dcd_edpt_open        (uint8_t rhport, tusb_descriptor_endpoint_t const * p_endpoint_desc);

+bool tusb_dcd_edpt_open        (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc);

 bool tusb_dcd_edpt_xfer        (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes);

 bool tusb_dcd_edpt_busy        (uint8_t rhport, uint8_t ep_addr);