more dcd clean up

3 files changed, 26 insertions, 24 deletions

diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index 587953e51..500cb8b8d 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -77,17 +77,15 @@ void dcd_xfer_complete    (uint8_t rhport, uint8_t ep_addr, uint32_t xferred_byt
 

 static inline void dcd_control_complete(uint8_t rhport)

 {

-  // TODO all control complete is successful !!

+  // all control complete is successful !!

   dcd_xfer_complete(rhport, 0, 0, true);

 }

 

 /*------------------------------------------------------------------*/

 /* Endpoint API

  *------------------------------------------------------------------*/

-//------------- Control Endpoint -------------//

-bool dcd_control_xfer     (uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);

 

-//------------- Other Endpoints -------------//

+//------------- Non-control Endpoints -------------//

 bool dcd_edpt_open        (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc);

 bool dcd_edpt_xfer        (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes);

 bool dcd_edpt_busy        (uint8_t rhport, uint8_t ep_addr);

@@ -95,6 +93,21 @@ bool dcd_edpt_busy        (uint8_t rhport, uint8_t ep_addr);
 void dcd_edpt_stall       (uint8_t rhport, uint8_t ep_addr);

 void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr);

 

+//------------- Control Endpoint -------------//

+bool dcd_control_xfer     (uint8_t rhport, tusb_dir_t dir, uint8_t * buffer, uint16_t length);

+

+// Note input dir is value of direction bit in setup packet (i.e DATA stage direction)

+static inline bool dcd_control_status(uint8_t rhport, tusb_dir_t dir)

+{

+  // status direction is reversed to one in the setup packet

+  return dcd_control_xfer(rhport, 1-dir, NULL, 0);

+}

+

+static inline void dcd_control_stall(uint8_t rhport)

+{

+  dcd_edpt_stall(rhport, 0);

+}

+

 #ifdef __cplusplus

  }

 #endif

diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 7ddbc39c7..fc9bb87e8 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -328,7 +328,7 @@ tusb_error_t usbd_control_xfer_st(uint8_t rhport, tusb_dir_t dir, uint8_t * buff
   // 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

-  usbd_control_status(rhport, dir);

+  dcd_control_status(rhport, dir);

 

   OSAL_SUBTASK_END

 }

@@ -354,7 +354,7 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
         STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len ), error );

       }else

       {

-        usbd_control_stall(rhport); // stall unsupported descriptor

+        dcd_control_stall(rhport); // stall unsupported descriptor

       }

     }

     else if (TUSB_REQ_GET_CONFIGURATION == p_request->bRequest )

@@ -368,17 +368,17 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
       usbd_devices[rhport].state = TUSB_DEVICE_STATE_ADDRESSED;

 

       #ifndef NRF52840_XXAA // nrf52 auto handle set address, we must not return status

-      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

+      dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

       #endif

     }

     else if ( TUSB_REQ_SET_CONFIGURATION == p_request->bRequest )

     {

       proc_set_config_req(rhport, (uint8_t) p_request->wValue);

-      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

+      dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

     }

     else

     {

-      usbd_control_stall(rhport); // Stall unsupported request

+      dcd_control_stall(rhport); // Stall unsupported request

     }

   }

 

@@ -396,7 +396,7 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
       STASK_INVOKE( usbd_class_drivers[class_code].control_request_st(rhport, p_request), error );

     }else

     {

-      usbd_control_stall(rhport); // Stall unsupported request

+      dcd_control_stall(rhport); // Stall unsupported request

     }

   }

 

@@ -407,17 +407,17 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
     if (TUSB_REQ_CLEAR_FEATURE == p_request->bRequest )

     {

       dcd_edpt_clear_stall(rhport, u16_low_u8(p_request->wIndex) );

-      usbd_control_status(rhport, p_request->bmRequestType_bit.direction);

+      dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

     } else

     {

-      usbd_control_stall(rhport); // Stall unsupported request

+      dcd_control_stall(rhport); // Stall unsupported request

     }

   }

 

   //------------- Unsupported Request -------------//

   else

   {

-    usbd_control_stall(rhport); // Stall unsupported request

+    dcd_control_stall(rhport); // Stall unsupported request

   }

 

   OSAL_SUBTASK_END

diff --git a/tinyusb/device/usbd_pvt.h b/tinyusb/device/usbd_pvt.h
index 073ce681b..6b4535eda 100644
--- a/tinyusb/device/usbd_pvt.h
+++ b/tinyusb/device/usbd_pvt.h
@@ -52,18 +52,7 @@ 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);
 
-// Return Status of control transfer
-// Note dir is value of direction bit in setup packet (aka DATA stage direction)
-static inline bool usbd_control_status(uint8_t rhport, tusb_dir_t dir)
-{
-  // status direction is reversed to one in the setup packet
-  return dcd_control_xfer(rhport, 1-dir, NULL, 0);
-}
 
-static inline void usbd_control_stall(uint8_t rhport)
-{
-  dcd_edpt_stall(rhport, 0);
-}
 
 
 #ifdef __cplusplus