shorten descriptor type

7 files changed, 25 insertions, 25 deletions

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