shorten descriptor type

2 files changed, 11 insertions, 11 deletions

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);