tusb_type rename

2 files changed, 13 insertions, 13 deletions

diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c
index e859e5c82..447867290 100644
--- a/tinyusb/host/hub.c
+++ b/tinyusb/host/hub.c
@@ -78,7 +78,7 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t hub_addr, uint8_t hub_port,
 

   //------------- Clear Port Feature request -------------//

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),

+      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),

                                  HUB_REQUEST_CLEAR_FEATURE, feature, hub_port,

                                  0, NULL ),

       error

@@ -87,7 +87,7 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t hub_addr, uint8_t hub_port,
 

   //------------- Get Port Status to check if feature is cleared -------------//

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),

+      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),

                                  HUB_REQUEST_GET_STATUS, 0, hub_port,

                                  4, hub_enum_buffer ),

       error

@@ -112,7 +112,7 @@ tusb_error_t hub_port_reset_subtask(uint8_t hub_addr, uint8_t hub_port)
 

   //------------- Set Port Reset -------------//

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),

+      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),

                                  HUB_REQUEST_SET_FEATURE, HUB_FEATURE_PORT_RESET, hub_port,

                                  0, NULL ),

       error

@@ -123,7 +123,7 @@ tusb_error_t hub_port_reset_subtask(uint8_t hub_addr, uint8_t hub_port)
 

   //------------- Get Port Status to check if port is enabled, powered and reset_change -------------//

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),

+      usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),

                                  HUB_REQUEST_GET_STATUS, 0, hub_port,

                                  4, hub_enum_buffer ),

       error

@@ -180,7 +180,7 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t cons
 

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

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-    usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_DEVICE),

+    usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_DEVICE),

                                HUB_REQUEST_GET_DESCRIPTOR, 0, 0,

                                sizeof(descriptor_hub_desc_t), hub_enum_buffer ),

     error

@@ -195,7 +195,7 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t cons
   for(i=1; i <= hub_data[dev_addr-1].port_number; i++)

   {

     OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),

+      usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),

                                  HUB_REQUEST_SET_FEATURE, HUB_FEATURE_PORT_POWER, i,

                                  0, NULL ),

       error

diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index b0d69a32d..b8f030cbc 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -407,7 +407,7 @@ tusb_error_t enumeration_body_subtask(void)
   {

     //------------- Get Port Status -------------//

     OSAL_SUBTASK_INVOKED_AND_WAIT(

-        usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_OTHER),

+        usbh_control_xfer_subtask( usbh_devices[0].hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),

                                    HUB_REQUEST_GET_STATUS, 0, usbh_devices[0].hub_port,

                                    4, enum_data_buffer ),

         error

@@ -449,7 +449,7 @@ tusb_error_t enumeration_body_subtask(void)
 

   //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------//

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),

+      usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),

                                  TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_DEVICE << 8), 0,

                                  8, enum_data_buffer ),

       error

@@ -482,7 +482,7 @@ tusb_error_t enumeration_body_subtask(void)
   SUBTASK_ASSERT(new_addr <= TUSB_CFG_HOST_DEVICE_MAX); // TODO notify application we reach max devices

 

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-    usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),

+    usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),

                                TUSB_REQUEST_SET_ADDRESS, new_addr, 0,

                                0, NULL ),

     error

@@ -504,7 +504,7 @@ tusb_error_t enumeration_body_subtask(void)
 

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

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),

+      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),

                                  TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_DEVICE << 8), 0,

                                  18, enum_data_buffer ),

       error

@@ -521,7 +521,7 @@ tusb_error_t enumeration_body_subtask(void)
 

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

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),

+      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),

                                  TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1), 0,

                                  9, enum_data_buffer ),

       error

@@ -532,7 +532,7 @@ tusb_error_t enumeration_body_subtask(void)
 

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

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),

+      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),

                                  TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1), 0,

                                  TUSB_CFG_HOST_ENUM_BUFFER_SIZE, enum_data_buffer ),

       error

@@ -544,7 +544,7 @@ tusb_error_t enumeration_body_subtask(void)
 

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

   OSAL_SUBTASK_INVOKED_AND_WAIT(

-    usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),

+    usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),

                                TUSB_REQUEST_SET_CONFIGURATION, configure_selected, 0,

                                0, NULL ),

     error