change usbd_control_xfer_st from function to macro to prevent compiler issue with substask

6 files changed, 39 insertions, 49 deletions

diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
index 072e79404..4144dc018 100644
--- a/tinyusb/class/cdc/cdc_device.c
+++ b/tinyusb/class/cdc/cdc_device.c
@@ -218,21 +218,15 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons
 {

   OSAL_SUBTASK_BEGIN

 

-  tusb_error_t err;

-

   //------------- Class Specific Request -------------//

   if (p_request->bmRequestType_bit.type != TUSB_REQ_TYPE_CLASS) return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT;

 

-  if (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest)

-  {

-    STASK_INVOKE( usbd_control_xfer_st(rhport, (tusb_dir_t) p_request->bmRequestType_bit.direction,

-                                            (uint8_t*) &cdcd_line_coding[rhport], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );

-  }

-  else if (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest)

+  if ( (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest) || (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest) )

   {

-    STASK_INVOKE( usbd_control_xfer_st(rhport, (tusb_dir_t) p_request->bmRequestType_bit.direction,

-                                            (uint8_t*) &cdcd_line_coding[rhport], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );

-    // TODO notify application on xfer complete

+    uint16_t len = min16_of(sizeof(cdc_line_coding_t), p_request->wLength);

+    usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) &cdcd_line_coding[rhport], len);

+

+    // TODO notify application on set line encoding

   }

   else if (CDC_REQUEST_SET_CONTROL_LINE_STATE == p_request->bRequest )

   {

diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c
index cd40dd86c..6790ef739 100644
--- a/tinyusb/class/hid/hid_device.c
+++ b/tinyusb/class/hid/hid_device.c
@@ -192,8 +192,6 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
 

   OSAL_SUBTASK_BEGIN

 

-  tusb_error_t err;

-

   //------------- STD Request -------------//

   if (p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_STANDARD)

   {

@@ -209,7 +207,7 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
       // copy to allow report descriptor not to be in USBRAM

       memcpy(m_hid_buffer, p_hid->p_report_desc, p_hid->report_length);

 

-      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length), err );

+      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length);

     }else

     {

       dcd_control_stall(rhport);

@@ -227,14 +225,13 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
                                                        &p_buffer, p_request->wLength);

       STASK_ASSERT( p_buffer != NULL && actual_length > 0 );

 

-      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_buffer, actual_length), err );

+      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_buffer, actual_length);

     }

     else if ( (HID_REQUEST_CONTROL_SET_REPORT == p_request->bRequest) && (p_driver->set_report_cb != NULL) )

     {

       //        return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT; // TODO test STALL control out endpoint (with mouse+keyboard)

       // wValue = Report Type | Report ID

-      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_request->wLength), err );

-      STASK_ASSERT_ERR(err);

+      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_request->wLength);

 

       p_driver->set_report_cb(rhport, u16_high_u8(p_request->wValue), m_hid_buffer, p_request->wLength);

     }

diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index cbee1312e..3e9008a90 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -153,7 +153,7 @@ tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t cons
   {

     // Note: lpc11/13u need xfer data's address to be aligned 64 -> make use of scsi_data instead of using max_lun directly

     p_msc->scsi_data[0] = p_msc->max_lun;

-    STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err);

+    usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1);

   }else

   {

     dcd_control_stall(rhport); // stall unsupported request

diff --git a/tinyusb/common/tusb_common.h b/tinyusb/common/tusb_common.h
index 273f13b49..b45027c44 100644
--- a/tinyusb/common/tusb_common.h
+++ b/tinyusb/common/tusb_common.h
@@ -66,6 +66,7 @@
 #include "tusb_verify.h"

 #include "binary.h"

 #include "tusb_error.h"

+#include "tusb_hal.h"

 #include "tusb_fifo.h"

 

 //------------- TUSB Header -------------//

diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 404a66e7e..d18cb258a 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -189,8 +189,8 @@ VERIFY_STATIC(sizeof(usbd_task_event_t) <= 12, "size is not correct");
 #endif

 

 

-static osal_queue_t _usbd_q;

-static osal_semaphore_t _control_sem; // TODO may need to change to static with wrapper function

+static osal_queue_t     _usbd_q;

+/*static*/ osal_semaphore_t _usbd_ctrl_sem;

 

 //--------------------------------------------------------------------+

 // IMPLEMENTATION

@@ -212,7 +212,7 @@ tusb_error_t usbd_init (void)
   _usbd_q = osal_queue_create(USBD_TASK_QUEUE_DEPTH, sizeof(usbd_task_event_t));

   VERIFY(_usbd_q, TUSB_ERROR_OSAL_QUEUE_FAILED);

 

-  _control_sem = osal_semaphore_create(1, 0);

+  _usbd_ctrl_sem = osal_semaphore_create(1, 0);

   VERIFY(_usbd_q, TUSB_ERROR_OSAL_SEMAPHORE_FAILED);

 

   osal_task_create(usbd_task, "usbd", TUC_DEVICE_STACKSIZE, NULL, TUSB_CFG_OS_TASK_PRIO);

@@ -310,29 +310,6 @@ static tusb_error_t usbd_main_st(void)
 //--------------------------------------------------------------------+

 // CONTROL REQUEST

 //--------------------------------------------------------------------+

-tusb_error_t usbd_control_xfer_st(uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length)

-{

-  OSAL_SUBTASK_BEGIN

-

-  tusb_error_t error;

-

-  // Data

-  if ( length )

-  {

-    dcd_control_xfer(rhport, dir, buffer, length);

-    osal_semaphore_wait( _control_sem, 100, &error );

-

-    STASK_ASSERT_ERR( error );

-  }

-

-  // Status opposite direction with Zero Length

-  // No need to wait for status to complete therefore

-  // status phase must not call dcd_control_complete/dcd_xfer_complete

-  dcd_control_status(rhport, dir);

-

-  OSAL_SUBTASK_END

-}

-

 static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request_t const * const p_request)

 {

   OSAL_SUBTASK_BEGIN

@@ -351,7 +328,7 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
 

       if ( len )

       {

-        STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len ), error );

+        usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len );

       }else

       {

         dcd_control_stall(rhport); // stall unsupported descriptor

@@ -360,7 +337,7 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
     else if (TUSB_REQ_GET_CONFIGURATION == p_request->bRequest )

     {

       memcpy(usbd_enum_buffer, &usbd_devices[rhport].config_num, 1);

-      STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) usbd_enum_buffer, 1), error );

+      usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) usbd_enum_buffer, 1);

     }

     else if ( TUSB_REQ_SET_ADDRESS == p_request->bRequest )

     {

@@ -533,7 +510,7 @@ void dcd_bus_event(uint8_t rhport, usbd_bus_event_type_t bus_event)
     case USBD_BUS_EVENT_RESET     :

       memclr_(&usbd_devices[rhport], sizeof(usbd_device_info_t));

       osal_queue_flush(_usbd_q);

-      osal_semaphore_reset(_control_sem);

+      osal_semaphore_reset(_usbd_ctrl_sem);

       for (uint8_t class_code = TUSB_CLASS_AUDIO; class_code < USBD_CLASS_DRIVER_COUNT; class_code++)

       {

         if ( usbd_class_drivers[class_code].close ) usbd_class_drivers[class_code].close( rhport );

@@ -585,7 +562,7 @@ void dcd_xfer_complete(uint8_t rhport, uint8_t ep_addr, uint32_t xferred_bytes,
     (void) succeeded;

 

     // Control Transfer

-    osal_semaphore_post( _control_sem );

+    osal_semaphore_post( _usbd_ctrl_sem );

   }else

   {

     usbd_task_event_t task_event =

diff --git a/tinyusb/device/usbd_pvt.h b/tinyusb/device/usbd_pvt.h
index 07d941d1c..cf1d822b2 100644
--- a/tinyusb/device/usbd_pvt.h
+++ b/tinyusb/device/usbd_pvt.h
@@ -41,6 +41,9 @@
  extern "C" {
 #endif
 
+// for used by usbd_control_xfer_st() only, must not be used directly
+extern osal_semaphore_t _usbd_ctrl_sem;
+
 //--------------------------------------------------------------------+
 // INTERNAL API
 //--------------------------------------------------------------------+
@@ -48,7 +51,25 @@ tusb_error_t usbd_init(void);
 void         usbd_task( void* param);
 
 // Carry out Data and Status stage of control transfer
-tusb_error_t usbd_control_xfer_st(uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);
+//tusb_error_t usbd_control_xfer_st(uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);
+
+// Carry out Data and Status stage of control transfer
+// Must be call in a subtask (_st) function
+#define usbd_control_xfer_st(_rhport, _dir, _buffer, _len) \
+  do {\
+    if (_len) { \
+      tusb_error_t err;\
+      dcd_control_xfer(_rhport, _dir, _buffer, _len);\
+      osal_semaphore_wait( _usbd_ctrl_sem, OSAL_TIMEOUT_NORMAL, &err );\
+      STASK_ASSERT_ERR( err );\
+    }\
+    /* No need to wait for status to complete therefore */ \
+    /* status phase must not call dcd_control_complete/dcd_xfer_complete*/ \
+    dcd_control_status(_rhport, _dir);\
+  }while(0)
+
+
+
 
 #ifdef __cplusplus
  }