From d036f62b0ec72a2241c0b6075140e89bf6e45309 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Tue, 20 Nov 2018 17:25:41 +0700
Subject: samd51 fix stable issue with dcd

---
 src/device/dcd.h          | 12 ++++++++----
 src/device/usbd.c         | 19 +++++++++++++++----
 src/device/usbd_control.c |  8 ++++----
 3 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'src/device')

diff --git a/src/device/dcd.h b/src/device/dcd.h
index bd0ea852e..f07bda2d3 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -124,10 +124,14 @@ void dcd_event_xfer_complete (uint8_t rhport, uint8_t ep_addr, uint32_t xferred_
 
 /*------------------------------------------------------------------*/
 /* Endpoint API
- * Note:
- * - Address of control endpoint OUT is 0x00, In is 0x80
- * - When stalling control endpoint both control OUT and IN must be stalled
- * (according to USB spec, stalled control is only recovered with setup token)
+ *  - open        : Configure endpoint's registers
+ *  - xfer        : Submit a transfer. When complete dcd_event_xfer_complete
+ *                  must be called to notify the stack
+ *  - busy        : Check if endpoint transferring is complete (TODO remove)
+ *  - stall       : stall ep. When control endpoint (addr = 0) is stalled,
+ *                  both direction (IN & OUT) of control ep must be stalled.
+ *  - clear_stall : clear stall
+ *  - stalled     : check if stalled ( TODO remove )
  *------------------------------------------------------------------*/
 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);
diff --git a/src/device/usbd.c b/src/device/usbd.c
index eac1a6a20..f39605987 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -174,7 +174,7 @@ static bool process_set_config(uint8_t rhport, uint8_t config_number);
 static void const* get_descriptor(tusb_control_request_t const * p_request, uint16_t* desc_len);
 
 void usbd_control_reset (uint8_t rhport);
-tusb_error_t usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes);
+bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes);
 void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_request_t const * ) );
 
 //--------------------------------------------------------------------+
@@ -338,7 +338,10 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
     switch ( p_request->bRequest )
     {
       case TUSB_REQ_SET_ADDRESS:
+        // response with status first before changing device address
+        usbd_control_status(rhport, p_request);
         dcd_set_address(rhport, (uint8_t) p_request->wValue);
+        return true; // skip the rest
       break;
 
       case TUSB_REQ_GET_CONFIGURATION:
@@ -362,7 +365,9 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
         if ( data_buf == NULL || data_len == 0 ) return false;
       break;
 
-      default: return false;
+      default:
+        TU_BREAKPOINT();
+      return false;
     }
 
     usbd_control_xfer(rhport, p_request, data_buf, data_len);
@@ -405,12 +410,15 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
         usbd_control_status(rhport, p_request);
       break;
 
-      default: return false;
+      default:
+        TU_BREAKPOINT();
+      return false;
     }
   }
   else
   {
     //------------- Unsupported Request -------------//
+    TU_BREAKPOINT();
     return false;
   }
 
@@ -549,10 +557,13 @@ void dcd_event_handler(dcd_event_t const * event, bool in_isr)
   {
     case DCD_EVENT_BUS_RESET:
     case DCD_EVENT_UNPLUGGED:
-    case DCD_EVENT_SOF:
       osal_queue_send(_usbd_q, event, in_isr);
     break;
 
+    case DCD_EVENT_SOF:
+      // nothing to do now
+    break;
+
     case DCD_EVENT_SUSPENDED:
       // TODO support suspended
     break;
diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index a9687a3e6..8564d1ae9 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -126,7 +126,7 @@ bool usbd_control_xfer(uint8_t rhport, tusb_control_request_t const * request, v
 }
 
 // callback when a transaction complete on DATA stage of control endpoint
-tusb_error_t usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)
+bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t event, uint32_t xferred_bytes)
 {
   if ( _control_state.request.bmRequestType_bit.direction == TUSB_DIR_OUT )
   {
@@ -151,7 +151,7 @@ tusb_error_t usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t
     if ( is_ok )
     {
       // Send status
-      TU_ASSERT( usbd_control_status(rhport, &_control_state.request), TUSB_ERROR_FAILED );
+      TU_ASSERT( usbd_control_status(rhport, &_control_state.request) );
     }else
     {
       // stall due to callback
@@ -161,10 +161,10 @@ tusb_error_t usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, tusb_event_t
   else
   {
     // More data to transfer
-    TU_ASSERT(start_control_data_xact(rhport), TUSB_ERROR_FAILED);
+    TU_ASSERT( start_control_data_xact(rhport) );
   }
 
-  return TUSB_ERROR_NONE;
+  return true;
 }
 
 #endif
-- 
cgit v1.3.1