change usbh_control_xfer name and signature

src/common/tusb_types.h

@@ -358,6 +358,7 @@ typedef struct ATTR_PACKED{
       uint8_t type      :  2; ///< Request type tusb_request_type_t.
       uint8_t direction :  1; ///< Direction type. tusb_dir_t
     } bmRequestType_bit;
+
     uint8_t bmRequestType;
   };
 

src/host/hub.c

@@ -71,15 +71,27 @@ bool hub_port_clear_feature_subtask(uint8_t hub_addr, uint8_t hub_port, uint8_t
 {
   TU_ASSERT(HUB_FEATURE_PORT_CONNECTION_CHANGE <= feature && feature <= HUB_FEATURE_PORT_RESET_CHANGE);
 
+  tusb_control_request_t request = {
+          .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_OTHER, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
+          .bRequest = HUB_REQUEST_CLEAR_FEATURE,
+          .wValue = feature,
+          .wIndex = hub_port,
+          .wLength = 0
+  };
+
   //------------- Clear Port Feature request -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),
+  TU_ASSERT( usbh_control_xfer( hub_addr, &request, NULL ) );
-                                        HUB_REQUEST_CLEAR_FEATURE, feature, hub_port,
-                                        0, NULL ) );
 
   //------------- Get Port Status to check if feature is cleared -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),
+  request = (tusb_control_request_t ) {
-                                        HUB_REQUEST_GET_STATUS, 0, hub_port,
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_OTHER, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },
-                                        4, hub_enum_buffer ) );
+        .bRequest = HUB_REQUEST_GET_STATUS,
+        .wValue = 0,
+        .wIndex = hub_port,
+        .wLength = 4
+  };
+
+  TU_ASSERT( usbh_control_xfer( hub_addr, &request, hub_enum_buffer ) );
 
   //------------- Check if feature is cleared -------------//
   hub_port_status_response_t * p_port_status;
@@ -96,16 +108,28 @@ bool hub_port_reset_subtask(uint8_t hub_addr, uint8_t hub_port)
   tusb_error_t error;
 
   //------------- Set Port Reset -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),
+  tusb_control_request_t request = {
-                                 HUB_REQUEST_SET_FEATURE, HUB_FEATURE_PORT_RESET, hub_port,
+          .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_OTHER, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
-                                 0, NULL ) );
+          .bRequest = HUB_REQUEST_SET_FEATURE,
+          .wValue = HUB_FEATURE_PORT_RESET,
+          .wIndex = hub_port,
+          .wLength = 0
+  };
+
+  TU_ASSERT( usbh_control_xfer( hub_addr, &request, NULL ) );
 
   osal_task_delay(RESET_DELAY); // TODO Hub wait for Status Endpoint on Reset Change
 
   //------------- Get Port Status to check if port is enabled, powered and reset_change -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),
+  request = (tusb_control_request_t ) {
-                                        HUB_REQUEST_GET_STATUS, 0, hub_port,
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_OTHER, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },
-                                        4, hub_enum_buffer ) );
+        .bRequest = HUB_REQUEST_GET_STATUS,
+        .wValue = 0,
+        .wIndex = hub_port,
+        .wLength = 4
+  };
+
+  TU_ASSERT( usbh_control_xfer( hub_addr, &request, hub_enum_buffer ) );
 
   hub_port_status_response_t * p_port_status;
   p_port_status = (hub_port_status_response_t *) hub_enum_buffer;
@@ -152,20 +176,33 @@ bool hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface
   (*p_length) = sizeof(tusb_desc_interface_t) + sizeof(tusb_desc_endpoint_t);
 
   //------------- Get Hub Descriptor -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_DEVICE),
+  tusb_control_request_t request = {
-                                        HUB_REQUEST_GET_DESCRIPTOR, 0, 0,
+          .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_DEVICE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },
-                                        sizeof(descriptor_hub_desc_t), hub_enum_buffer ) );
+          .bRequest = HUB_REQUEST_GET_DESCRIPTOR,
+          .wValue = 0,
+          .wIndex = 0,
+          .wLength = sizeof(descriptor_hub_desc_t)
+  };
+
+  TU_ASSERT( usbh_control_xfer( dev_addr, &request, hub_enum_buffer ) );
 
   // only care about this field in hub descriptor
   hub_data[dev_addr-1].port_number = ((descriptor_hub_desc_t*) hub_enum_buffer)->bNbrPorts;
 
   //------------- Set Port_Power on all ports -------------//
-  static uint8_t i;
+  // TODO may only power port with attached
-  for(i=1; i <= hub_data[dev_addr-1].port_number; i++)
+  request = (tusb_control_request_t ) {
+          .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_OTHER, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
+          .bRequest = HUB_REQUEST_SET_FEATURE,
+          .wValue = HUB_FEATURE_PORT_POWER,
+          .wIndex = 0,
+          .wLength = 0
+  };
+
+  for(uint8_t i=1; i <= hub_data[dev_addr-1].port_number; i++)
   {
-    TU_ASSERT( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),
+    request.wIndex = i;
-                                          HUB_REQUEST_SET_FEATURE, HUB_FEATURE_PORT_POWER, i,
+    TU_ASSERT( usbh_control_xfer( dev_addr, &request, NULL ) );
-                                          0, NULL ) );
   }
 
   //------------- Queue the initial Status endpoint transfer -------------//

src/host/usbh.c

@@ -190,20 +190,13 @@ bool usbh_init(void)
 }
 
 //------------- USBH control transfer -------------//
-bool usbh_control_xfer_subtask (uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,
+bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8_t* data)
-                                       uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data)
 {
   usbh_device_t* dev = &_usbh_devices[dev_addr];
 
   TU_ASSERT(osal_mutex_lock(dev->control.mutex_hdl, OSAL_TIMEOUT_NORMAL));
 
-  dev->control.request = (tusb_control_request_t ) {
+  dev->control.request = *request;
-                                                  {.bmRequestType = bmRequestType},
-                                                  .bRequest      = bRequest,
-                                                  .wValue        = wValue,
-                                                  .wIndex        = wIndex,
-                                                  .wLength       = wLength
-                                           };
   dev->control.pipe_status = 0;
 
   TU_ASSERT_ERR(hcd_pipe_control_xfer(dev_addr, &dev->control.request, data), false);
@@ -383,6 +376,7 @@ bool enum_task(hcd_event_t* event)
   static uint8_t *p_desc = NULL; // TODO move
 
   usbh_device_t* dev0 = &_usbh_devices[0];
+  tusb_control_request_t request;
 
   dev0->core_id  = event->rhport; // TODO refractor integrate to device_pool
   dev0->hub_addr = event->plug.hub_addr;
@@ -417,10 +411,15 @@ bool enum_task(hcd_event_t* event)
   else
   {
     //------------- Get Port Status -------------//
-    TU_VERIFY_HDLR( usbh_control_xfer_subtask( dev0->hub_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_OTHER),
+    request = (tusb_control_request_t ) {
-                                               HUB_REQUEST_GET_STATUS, 0, dev0->hub_port,
+          .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_OTHER, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },
-                                               4, _usbh_ctrl_buf )
+          .bRequest = HUB_REQUEST_GET_STATUS,
-                    , hub_status_pipe_queue( dev0->hub_addr) ); // TODO hub refractor
+          .wValue = 0,
+          .wIndex = dev0->hub_port,
+          .wLength = 4
+    };
+    // TODO hub refractor
+    TU_VERIFY_HDLR( usbh_control_xfer( dev0->hub_addr, &request, _usbh_ctrl_buf ), hub_status_pipe_queue( dev0->hub_addr) );
 
     // Acknowledge Port Connection Change
     hub_port_clear_feature_subtask(dev0->hub_addr, dev0->hub_port, HUB_FEATURE_PORT_CONNECTION_CHANGE);
@@ -456,9 +455,14 @@ bool enum_task(hcd_event_t* event)
   dev0->state = TUSB_DEVICE_STATE_ADDRESSED;
 
   //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------//
-  bool is_ok = usbh_control_xfer_subtask(0, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),
+  request = (tusb_control_request_t ) {
-                                         TUSB_REQ_GET_DESCRIPTOR,
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_DEVICE, .type = TUSB_REQ_TYPE_STANDARD, .direction = TUSB_DIR_IN },
-                                         (TUSB_DESC_DEVICE << 8), 0, 8, _usbh_ctrl_buf);
+        .bRequest = TUSB_REQ_GET_DESCRIPTOR,
+        .wValue = TUSB_DESC_DEVICE << 8,
+        .wIndex = 0,
+        .wLength = 8
+  };
+  bool is_ok = usbh_control_xfer(0, &request, _usbh_ctrl_buf);
 
   //------------- Reset device again before Set Address -------------//
   if (dev0->hub_addr == 0)
@@ -488,9 +492,14 @@ bool enum_task(hcd_event_t* event)
   uint8_t const new_addr = get_new_address();
   TU_ASSERT(new_addr <= CFG_TUSB_HOST_DEVICE_MAX); // TODO notify application we reach max devices
 
-  TU_ASSERT(usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),
+  request = (tusb_control_request_t ) {
-            TUSB_REQ_SET_ADDRESS, new_addr, 0,
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_DEVICE, .type = TUSB_REQ_TYPE_STANDARD, .direction = TUSB_DIR_OUT },
-            0, NULL ));
+        .bRequest = TUSB_REQ_SET_ADDRESS,
+        .wValue = new_addr,
+        .wIndex = 0,
+        .wLength = 0
+  };
+  TU_ASSERT(usbh_control_xfer(0, &request, NULL));
 
   //------------- update port info & close control pipe of addr0 -------------//
   usbh_device_t* new_dev = &_usbh_devices[new_addr];
@@ -507,11 +516,14 @@ bool enum_task(hcd_event_t* event)
   TU_ASSERT_ERR ( usbh_pipe_control_open(new_addr, ((tusb_desc_device_t*) _usbh_ctrl_buf)->bMaxPacketSize0 ) );
 
   //------------- Get full device descriptor -------------//
-  TU_ASSERT(
+  request = (tusb_control_request_t ) {
-      usbh_control_xfer_subtask(new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_DEVICE, .type = TUSB_REQ_TYPE_STANDARD, .direction = TUSB_DIR_IN },
-                                     TUSB_REQ_GET_DESCRIPTOR, (TUSB_DESC_DEVICE << 8), 0,
+        .bRequest = TUSB_REQ_GET_DESCRIPTOR,
-                                18,
+        .wValue = TUSB_DESC_DEVICE << 8,
-                                _usbh_ctrl_buf));
+        .wIndex = 0,
+        .wLength = 18
+  };
+  TU_ASSERT(usbh_control_xfer(new_addr, &request, _usbh_ctrl_buf));
 
   // update device info  TODO alignment issue
   new_dev->vendor_id       = ((tusb_desc_device_t*) _usbh_ctrl_buf)->idVendor;
@@ -522,28 +534,34 @@ bool enum_task(hcd_event_t* event)
   TU_ASSERT(configure_selected <= new_dev->configure_count); // TODO notify application when invalid configuration
 
   //------------- Get 9 bytes of configuration descriptor -------------//
-  TU_ASSERT(
+  request = (tusb_control_request_t ) {
-      usbh_control_xfer_subtask(new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_DEVICE, .type = TUSB_REQ_TYPE_STANDARD, .direction = TUSB_DIR_IN },
-                                TUSB_REQ_GET_DESCRIPTOR,
+        .bRequest = TUSB_REQ_GET_DESCRIPTOR,
-                                (TUSB_DESC_CONFIGURATION << 8) | (configure_selected - 1), 0,
+        .wValue = (TUSB_DESC_CONFIGURATION << 8) | (configure_selected - 1),
-                                9,
+        .wIndex = 0,
-                                _usbh_ctrl_buf));
+        .wLength = 9
+  };
+  TU_ASSERT( usbh_control_xfer(new_addr, &request, _usbh_ctrl_buf));
 
-  TU_VERIFY_HDLR( CFG_TUSB_HOST_ENUM_BUFFER_SIZE >= ((tusb_desc_configuration_t*)_usbh_ctrl_buf)->wTotalLength,
+  // TODO not enough buffer to hold configuration descriptor
-                  tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );
+  TU_ASSERT( CFG_TUSB_HOST_ENUM_BUFFER_SIZE >= ((tusb_desc_configuration_t*)_usbh_ctrl_buf)->wTotalLength );
 
   //------------- Get full configuration descriptor -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),
+  request.wLength = ((tusb_desc_configuration_t*)_usbh_ctrl_buf)->wTotalLength; // full length
-                                     TUSB_REQ_GET_DESCRIPTOR, (TUSB_DESC_CONFIGURATION << 8) | (configure_selected - 1), 0,
+  TU_ASSERT( usbh_control_xfer( new_addr, &request, _usbh_ctrl_buf ) );
-                                     CFG_TUSB_HOST_ENUM_BUFFER_SIZE, _usbh_ctrl_buf ) );
 
   // update configuration info
   new_dev->interface_count = ((tusb_desc_configuration_t*) _usbh_ctrl_buf)->bNumInterfaces;
 
   //------------- Set Configure -------------//
-  TU_ASSERT( usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE),
+  request = (tusb_control_request_t ) {
-                                     TUSB_REQ_SET_CONFIGURATION, configure_selected, 0,
+        .bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_DEVICE, .type = TUSB_REQ_TYPE_STANDARD, .direction = TUSB_DIR_OUT },
-                                     0, NULL ));
+        .bRequest = TUSB_REQ_SET_CONFIGURATION,
+        .wValue = configure_selected,
+        .wIndex = 0,
+        .wLength = 0
+  };
+  TU_ASSERT(usbh_control_xfer( new_addr, &request, NULL ));
 
   new_dev->state = TUSB_DEVICE_STATE_CONFIGURED;
 
@@ -607,6 +625,8 @@ bool usbh_task_body(void)
       case HCD_EVENT_DEVICE_UNPLUG:
         enum_task(&event);
       break;
+
+      default: break;
     }
   }
 }

src/host/usbh.h

@@ -100,8 +100,8 @@ ATTR_WEAK void    tuh_device_mount_failed_cb(tusb_error_t error, tusb_desc_devic
 bool usbh_init(void);
 void usbh_task(void* param);
 
-bool usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,
+bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8_t* data);
-                                       uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data);
+
 #endif
 
 #ifdef __cplusplus

tests/lpc18xx_43xx/test/host/usbh/test_usbh.c

@@ -222,7 +222,7 @@ void test_usbh_control_xfer_mutex_failed(void)
   osal_mutex_release_ExpectAndReturn(_usbh_devices[dev_addr].control.mutex_hdl, TUSB_ERROR_NONE);
 
   //------------- Code Under Test -------------//
-  usbh_control_xfer_subtask(dev_addr, 1, 2, 3, 4, 0, NULL);
+  usbh_control_xfer(dev_addr, 1, 2, 3, 4, 0, NULL);
 }
 
 void test_usbh_control_xfer_ok(void)
@@ -244,7 +244,7 @@ void test_usbh_control_xfer_ok(void)
   osal_mutex_release_ExpectAndReturn(_usbh_devices[dev_addr].control.mutex_hdl, TUSB_ERROR_NONE);
 
   //------------- Code Under Test -------------//
-  usbh_control_xfer_subtask(dev_addr, 1, 2, 3, 4, 0, NULL);
+  usbh_control_xfer(dev_addr, 1, 2, 3, 4, 0, NULL);
 }
 
 //void test_usbh_xfer_isr_non_control_stalled(void) // do nothing for stall on control