change usbh_control_xfer_subtask to use flat API instead of passing tusb_control_request_t struct

6 files changed, 82 insertions, 66 deletions

diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c
index e0f4501ec..0e97c5d9a 100644
--- a/tinyusb/class/cdc_host.c
+++ b/tinyusb/class/cdc_host.c
@@ -204,8 +204,8 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
   {
     OSAL_SUBTASK_INVOKED_AND_WAIT( rndish_open_subtask(dev_addr, p_cdc), error );
   }
-
-  if ( TUSB_ERROR_NONE != error ) // device is not an rndis
+  else
+//  if ( TUSB_ERROR_NONE != error ) // device is not an rndis
 #endif
 
   // FIXME mounted class flag is not set yet
diff --git a/tinyusb/class/cdc_rndis_host.c b/tinyusb/class/cdc_rndis_host.c
index ebb3285bb..024329b4b 100644
--- a/tinyusb/class/cdc_rndis_host.c
+++ b/tinyusb/class/cdc_rndis_host.c
@@ -107,23 +107,14 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
       .max_xfer_size = 0x4000 // TODO mimic windows
   };
 
-  static tusb_control_request_t control_request =
-  {
-      .bmRequestType = {
-          .direction = TUSB_DIR_HOST_TO_DEV,
-          .type      = TUSB_REQUEST_TYPE_CLASS,
-          .recipient = TUSB_REQUEST_RECIPIENT_INTERFACE
-      },
-      .bRequest = SEND_ENCAPSULATED_COMMAND,
-      .wLength   = sizeof(rndis_msg_initialize_t)
-//      .wIndex   = p_cdc->interface_number,
-  };
-
   OSAL_SUBTASK_BEGIN
 
-  control_request.wIndex   = p_cdc->interface_number;
-
-  OSAL_SUBTASK_INVOKED_AND_WAIT ( usbh_control_xfer_subtask(dev_addr, &control_request, (uint8_t*)&msg_init), error ) ;
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+    usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE),
+                               SEND_ENCAPSULATED_COMMAND, 0, p_cdc->interface_number,
+                               sizeof(rndis_msg_initialize_t), (uint8_t*)&msg_init ),
+    error
+  );
 
   if ( tusbh_cdc_rndis_mounted_cb )
   {
diff --git a/tinyusb/core/std_request.h b/tinyusb/core/std_request.h
index fcc2c08d7..1b2175501 100644
--- a/tinyusb/core/std_request.h
+++ b/tinyusb/core/std_request.h
@@ -57,11 +57,14 @@
 #endif
 
 typedef ATTR_PACKED_STRUCT(struct){
-  ATTR_PACKED_STRUCT(struct) {
-    uint8_t recipient :  5; /**< Recipient type tusb_std_request_recipient_t. */
-    uint8_t type      :  2; /**< Request type tusb_control_request_type_t.  */
-    uint8_t direction :  1; /**< Direction type. tusb_direction_t */
-  } bmRequestType;
+  union {
+    ATTR_PACKED_STRUCT(struct) {
+      uint8_t recipient :  5; /**< Recipient type tusb_std_request_recipient_t. */
+      uint8_t type      :  2; /**< Request type tusb_control_request_type_t.  */
+      uint8_t direction :  1; /**< Direction type. tusb_direction_t */
+    } bmRequestType_bit;
+    uint8_t bmRequestType;
+  };
 
   uint8_t  bRequest;
   uint16_t wValue;
@@ -69,6 +72,15 @@ typedef ATTR_PACKED_STRUCT(struct){
   uint16_t wLength;
 } tusb_control_request_t;
 
+//STATIC_ASSERT(sizeof(tusb_control_request_t) == 8, "mostly compiler option issue");
+
+// TODO move to somewhere suitable
+static inline uint8_t bm_request_type(uint8_t direction, uint8_t type, uint8_t recipient) ATTR_CONST ATTR_ALWAYS_INLINE;
+static inline uint8_t bm_request_type(uint8_t direction, uint8_t type, uint8_t recipient)
+{
+  return (direction << 7) | (type << 5) | recipient;
+}
+
 #ifdef __cplusplus
  }
 #endif
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index 401a1256d..dd62e734d 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -315,7 +315,7 @@ tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t con
   {
     qtd_init(p_data, (uint32_t) data, p_request->wLength);
     p_data->data_toggle = 1;
-    p_data->pid         = p_request->bmRequestType.direction ? EHCI_PID_IN : EHCI_PID_OUT;
+    p_data->pid         = p_request->bmRequestType_bit.direction ? EHCI_PID_IN : EHCI_PID_OUT;
   }else
   {
     p_data = p_setup;
@@ -326,7 +326,7 @@ tusb_error_t  hcd_pipe_control_xfer(uint8_t dev_addr, tusb_control_request_t con
   qtd_init(p_status, 0, 0); // zero-length data
   p_status->int_on_complete = 1;
   p_status->data_toggle     = 1;
-  p_status->pid             = p_request->bmRequestType.direction ? EHCI_PID_OUT : EHCI_PID_IN; // reverse direction of data phase
+  p_status->pid             = p_request->bmRequestType_bit.direction ? EHCI_PID_OUT : EHCI_PID_IN; // reverse direction of data phase
   p_status->next.terminate  = 1;
 
   //------------- Attach TDs list to Control Endpoint -------------//
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 7e7de66d2..646d472c9 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -183,10 +183,9 @@ 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, uint8_t bmRequestType, uint8_t bRequest,
-//                                       uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data )
-tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t const* p_request, uint8_t* data)
+// function called within a task, requesting os blocking services, subtask input parameter must be static/global variables or constant
+tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,
+                                       uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data )
 {
   tusb_error_t error;
 
@@ -195,9 +194,20 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, tusb_control_request_t
   osal_mutex_wait(usbh_devices[dev_addr].control.mutex_hdl, OSAL_TIMEOUT_NORMAL, &error);
   SUBTASK_ASSERT_STATUS_WITH_HANDLER(error, osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl));
 
-  usbh_devices[dev_addr].control.request = *p_request;
-  /*SUBTASK_ASSERT_STATUS*/ (void) ( hcd_pipe_control_xfer(dev_addr, &usbh_devices[dev_addr].control.request, data) );
+  usbh_devices[dev_addr].control.request = (tusb_control_request_t) {
+                                                  {.bmRequestType = bmRequestType},
+                                                  .bRequest      = bRequest,
+                                                  .wValue        = wValue,
+                                                  .wIndex        = wIndex,
+                                                  .wLength       = wLength
+                                           };
+
+#ifndef _TEST_
   usbh_devices[dev_addr].control.pipe_status = 0;
+#else
+  usbh_devices[dev_addr].control.pipe_status = TUSB_EVENT_XFER_COMPLETE; // in Test project, mark as complete to imm pass
+#endif
+  /*SUBTASK_ASSERT_STATUS*/ (void) ( hcd_pipe_control_xfer(dev_addr, &usbh_devices[dev_addr].control.request, data) );
 
   osal_semaphore_wait(usbh_devices[dev_addr].control.sem_hdl, OSAL_TIMEOUT_NORMAL, &error); // careful of local variable without static
 
@@ -324,12 +334,6 @@ tusb_error_t enumeration_body_subtask(void)
   static uint8_t new_addr;
   static uint8_t configure_selected = 1; // TODO move
   static uint8_t *p_desc = NULL; // TODO move
-  static tusb_control_request_t control_request = {
-      .bmRequestType = {
-          .type      = TUSB_REQUEST_TYPE_STANDARD,
-          .recipient = TUSB_REQUEST_RECIPIENT_DEVICE
-      }
-  };
 
   OSAL_SUBTASK_BEGIN
 
@@ -353,12 +357,13 @@ tusb_error_t enumeration_body_subtask(void)
 #endif
 
   //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------//
-  control_request.bmRequestType.direction = TUSB_DIR_DEV_TO_HOST;
-  control_request.bRequest = TUSB_REQUEST_GET_DESCRIPTOR;
-  control_request.wValue   = (TUSB_DESC_TYPE_DEVICE << 8);
-  control_request.wLength  = 8;
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+      usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),
+                                 TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_DEVICE << 8), 0,
+                                 8, enum_data_buffer ),
+      error
+  );
 
-  OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( 0, &control_request, enum_data_buffer ), error );
   SUBTASK_ASSERT_STATUS(error); // TODO some slow device is observed to fail the very fist controler xfer, can try more times
 
   hcd_port_reset( usbh_devices[0].core_id ); // reset port after 8 byte descriptor
@@ -367,12 +372,12 @@ tusb_error_t enumeration_body_subtask(void)
   new_addr = get_new_address();
   SUBTASK_ASSERT(new_addr <= TUSB_CFG_HOST_DEVICE_MAX); // TODO notify application we reach max devices
 
-  control_request.bmRequestType.direction = TUSB_DIR_HOST_TO_DEV;
-  control_request.bRequest = TUSB_REQUEST_SET_ADDRESS;
-  control_request.wValue   = new_addr;
-  control_request.wLength  = 0;
-
-  OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( 0, &control_request, NULL ), error );
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+    usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),
+                               TUSB_REQUEST_SET_ADDRESS, new_addr, 0,
+                               0, NULL ),
+    error
+  );
   SUBTASK_ASSERT_STATUS(error);
 
   //------------- update port info & close control pipe of addr0 -------------//
@@ -389,12 +394,12 @@ tusb_error_t enumeration_body_subtask(void)
   SUBTASK_ASSERT_STATUS ( usbh_pipe_control_open(new_addr, ((tusb_descriptor_device_t*) enum_data_buffer)->bMaxPacketSize0 ) );
 
   //------------- Get full device descriptor -------------//
-  control_request.bmRequestType.direction = TUSB_DIR_DEV_TO_HOST;
-  control_request.bRequest = TUSB_REQUEST_GET_DESCRIPTOR;
-  control_request.wValue   = (TUSB_DESC_TYPE_DEVICE << 8);
-  control_request.wLength  = 18;
-
-  OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( new_addr, &control_request, enum_data_buffer ), error );
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),
+                                 TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_DEVICE << 8), 0,
+                                 18, enum_data_buffer ),
+      error
+  );
   SUBTASK_ASSERT_STATUS(error);
 
   // update device info  TODO alignment issue
@@ -406,29 +411,35 @@ tusb_error_t enumeration_body_subtask(void)
   SUBTASK_ASSERT(configure_selected <= usbh_devices[new_addr].configure_count); // TODO notify application when invalid configuration
 
   //------------- Get 9 bytes of configuration descriptor -------------//
-  control_request.wValue   = (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1);
-  control_request.wLength  = 9;
-
-  OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( new_addr, &control_request, enum_data_buffer ), error );
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),
+                                 TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1), 0,
+                                 9, enum_data_buffer ),
+      error
+  );
   SUBTASK_ASSERT_STATUS(error);
   SUBTASK_ASSERT_WITH_HANDLER( TUSB_CFG_HOST_ENUM_BUFFER_SIZE > ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength,
                             tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );
 
   //------------- Get full configuration descriptor -------------//
-  control_request.wLength  = ((tusb_descriptor_configuration_t*) enum_data_buffer)->wTotalLength;
-  OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( new_addr, &control_request, enum_data_buffer ), error );
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+      usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),
+                                 TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1), 0,
+                                 ((tusb_descriptor_configuration_t*) enum_data_buffer)->wTotalLength, enum_data_buffer ),
+      error
+  );
   SUBTASK_ASSERT_STATUS(error);
 
   // update configuration info
   usbh_devices[new_addr].interface_count = ((tusb_descriptor_configuration_t*) enum_data_buffer)->bNumInterfaces;
 
   //------------- Set Configure -------------//
-  control_request.bmRequestType.direction = TUSB_DIR_HOST_TO_DEV;
-  control_request.bRequest = TUSB_REQUEST_SET_CONFIGURATION;
-  control_request.wValue   = configure_selected;
-  control_request.wLength  = 0;
-
-  OSAL_SUBTASK_INVOKED_AND_WAIT ( usbh_control_xfer_subtask( new_addr, &control_request, NULL ), error );
+  OSAL_SUBTASK_INVOKED_AND_WAIT(
+    usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_DEVICE),
+                               TUSB_REQUEST_SET_CONFIGURATION, configure_selected, 0,
+                               0, NULL ),
+    error
+  );
   SUBTASK_ASSERT_STATUS(error);
 
   usbh_devices[new_addr].state = TUSB_DEVICE_STATE_CONFIGURED;
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index 84e4fc930..7b4a5372f 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -111,7 +111,9 @@ 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_control_request_t const* p_request, uint8_t* data);
+tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,
+                                       uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data );
+
 
 #endif