Merge branch 'master' into develop

1 files changed, 12 insertions, 2 deletions

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 7f6cf5a40..e6d1caf4b 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -64,6 +64,7 @@ static inline bool _status_stage_xact(uint8_t rhport, tusb_control_request_t con
   return dcd_edpt_xfer(rhport, request->bmRequestType_bit.direction ? EDPT_CTRL_OUT : EDPT_CTRL_IN, NULL, 0);
 }
 
+// Status phase
 bool tud_control_status(uint8_t rhport, tusb_control_request_t const * request)
 {
   _ctrl_xfer.request       = (*request);
@@ -118,9 +119,8 @@ bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, vo
 // USBD API
 //--------------------------------------------------------------------+
 
-void usbd_control_reset (uint8_t rhport)
+void usbd_control_reset(void)
 {
-  (void) rhport;
   tu_varclr(&_ctrl_xfer);
 }
 
@@ -130,6 +130,15 @@ void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_reque
   _ctrl_xfer.complete_cb = fp;
 }
 
+// useful for dcd_set_address where DCD is responsible for status response
+void usbd_control_set_request(tusb_control_request_t const *request)
+{
+  _ctrl_xfer.request       = (*request);
+  _ctrl_xfer.buffer        = NULL;
+  _ctrl_xfer.total_xferred = 0;
+  _ctrl_xfer.data_len      = 0;
+}
+
 // callback when a transaction complete on
 // - DATA stage of control endpoint or
 // - Status stage
@@ -141,6 +150,7 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
   if ( tu_edpt_dir(ep_addr) != _ctrl_xfer.request.bmRequestType_bit.direction )
   {
     TU_ASSERT(0 == xferred_bytes);
+    if (dcd_edpt0_status_complete) dcd_edpt0_status_complete(rhport, &_ctrl_xfer.request);
     return true;
   }