shorten descriptor type

4 files changed, 11 insertions, 11 deletions

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