no big deal, only rename tusb_std_request_t to tusb_control_request_t

5 files changed, 11 insertions, 11 deletions

diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index c1ea9a7ed..401a1256d 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -297,7 +297,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   return TUSB_ERROR_NONE;
 }
 
-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_std_request_t const * p_request, uint8_t data[])
+tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t const * p_request, uint8_t data[])
 {
   ehci_qhd_t * const p_qhd = get_control_qhd(dev_addr);
 
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 788c989f4..bb6b40455 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -91,7 +91,7 @@ void hcd_isr(uint8_t hostid);
 //--------------------------------------------------------------------+
 // TODO control xfer should be used via usbh layer
 tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;
-tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_std_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;
+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;
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 11c8ec302..43c3b5ae6 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -184,7 +184,7 @@ tusb_error_t usbh_init(void)
 
 //------------- USBH control transfer -------------//
 // function called within a task, requesting os blocking services, subtask input parameter must be static/global variables
-tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_std_request_t const* p_request, uint8_t* data)
+tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t const* p_request, uint8_t* data)
 {
   tusb_error_t error;
 
@@ -347,7 +347,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       0,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -368,7 +368,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       0,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_SET_ADDRESS,
@@ -396,7 +396,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       new_addr,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -420,7 +420,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       new_addr,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -438,7 +438,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT(
     usbh_control_xfer_subtask(
       new_addr,
-      &(tusb_std_request_t)
+      &(tusb_control_request_t)
       {
         .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
         .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
@@ -457,7 +457,7 @@ tusb_error_t enumeration_body_subtask(void)
   OSAL_SUBTASK_INVOKED_AND_WAIT (
     usbh_control_xfer_subtask(
         new_addr,
-        &(tusb_std_request_t)
+        &(tusb_control_request_t)
         {
           .bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
           .bRequest = TUSB_REQUEST_SET_CONFIGURATION,
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index 31efcd536..84e4fc930 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -111,7 +111,7 @@ void         tusbh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_de
 OSAL_TASK_FUNCTION (usbh_enumeration_task) (void* p_task_para);
 tusb_error_t usbh_init(void);
 
-tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_std_request_t const* p_request, uint8_t* data);
+tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t const* p_request, uint8_t* data);
 
 #endif
 
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index cda043541..2e251396c 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -98,7 +98,7 @@ typedef struct { // TODO internal structure, re-order members
   //------------- control pipe -------------//
   struct {
     volatile uint8_t pipe_status;
-    tusb_std_request_t request;
+    tusb_control_request_t request;
 
     OSAL_SEM_DEF(semaphore);          // TODO move to semaphore pool ?
     osal_semaphore_handle_t sem_hdl;  // used to synchronize with HCD when control xfer complete