From e6857d8ee087c8185dda2901646fbec1352e2292 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 11:25:41 +0700
Subject: [PATCH 01/14] clean up

---
 src/device/usbd_control.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index e8bb648c..8b1c92d8 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -45,7 +45,6 @@ typedef struct
   void* buffer;
   uint16_t len;
   uint16_t total_transferred;
-  uint16_t requested_len;
 
   bool (*complete_cb) (uint8_t, tusb_control_request_t const *);
 } usbd_control_xfer_t;
@@ -90,16 +89,10 @@ void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_reque
 
 bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, void* buffer, uint16_t len)
 {
-  // transmitted length must be <= requested length (USB 2.0 spec: 8.5.3.1 )
-  // FIXME: Should logic be here or in place that calls this function?
-  if(len > request->wLength)
-    len = request->wLength;
-
   _control_state.request = (*request);
   _control_state.buffer = buffer;
   _control_state.total_transferred = 0;
-  _control_state.requested_len = request->wLength;
-  _control_state.len = len;
+  _control_state.len = tu_min16(len, request->wLength);
 
   if ( len )
   {
@@ -131,7 +124,7 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
   _control_state.total_transferred += xferred_bytes;
   _control_state.buffer = ((uint8_t*)_control_state.buffer) + xferred_bytes;
 
-  if ( (_control_state.requested_len == _control_state.total_transferred) || xferred_bytes < CFG_TUD_ENDPOINT0_SIZE )
+  if ( (_control_state.request.wLength == _control_state.total_transferred) || xferred_bytes < CFG_TUD_ENDPOINT0_SIZE )
 
   {
     // DATA stage is complete

From 0029b584177174ba6269a76151b029a03d8c09fc Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 12:15:16 +0700
Subject: [PATCH 02/14] rename

---
 src/device/usbd_control.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 8b1c92d8..7c970d60 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -49,14 +49,14 @@ typedef struct
   bool (*complete_cb) (uint8_t, tusb_control_request_t const *);
 } usbd_control_xfer_t;
 
-static usbd_control_xfer_t _control_state;
+static usbd_control_xfer_t _ctrl_xfer;
 
 CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
 
 void usbd_control_reset (uint8_t rhport)
 {
   (void) rhport;
-  tu_varclr(&_control_state);
+  tu_varclr(&_ctrl_xfer);
 }
 
 bool tud_control_status(uint8_t rhport, tusb_control_request_t const * request)
@@ -68,14 +68,14 @@ bool tud_control_status(uint8_t rhport, tusb_control_request_t const * request)
 // Each transaction is up to endpoint0's max packet size
 static bool start_control_data_xact(uint8_t rhport)
 {
-  uint16_t const xact_len = tu_min16(_control_state.len - _control_state.total_transferred, CFG_TUD_ENDPOINT0_SIZE);
+  uint16_t const xact_len = tu_min16(_ctrl_xfer.len - _ctrl_xfer.total_transferred, CFG_TUD_ENDPOINT0_SIZE);
 
   uint8_t ep_addr = EDPT_CTRL_OUT;
 
-  if ( _control_state.request.bmRequestType_bit.direction == TUSB_DIR_IN )
+  if ( _ctrl_xfer.request.bmRequestType_bit.direction == TUSB_DIR_IN )
   {
     ep_addr = EDPT_CTRL_IN;
-    memcpy(_usbd_ctrl_buf, _control_state.buffer, xact_len);
+    memcpy(_usbd_ctrl_buf, _ctrl_xfer.buffer, xact_len);
   }
 
   return dcd_edpt_xfer(rhport, ep_addr, _usbd_ctrl_buf, xact_len);
@@ -84,15 +84,15 @@ static bool start_control_data_xact(uint8_t rhport)
 // TODO may find a better way
 void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_request_t const * ) )
 {
-  _control_state.complete_cb = fp;
+  _ctrl_xfer.complete_cb = fp;
 }
 
 bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, void* buffer, uint16_t len)
 {
-  _control_state.request = (*request);
-  _control_state.buffer = buffer;
-  _control_state.total_transferred = 0;
-  _control_state.len = tu_min16(len, request->wLength);
+  _ctrl_xfer.request = (*request);
+  _ctrl_xfer.buffer = buffer;
+  _ctrl_xfer.total_transferred = 0;
+  _ctrl_xfer.len = tu_min16(len, request->wLength);
 
   if ( len )
   {
@@ -115,32 +115,31 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
   (void) result;
   (void) ep_addr;
 
-  if ( _control_state.request.bmRequestType_bit.direction == TUSB_DIR_OUT )
+  if ( _ctrl_xfer.request.bmRequestType_bit.direction == TUSB_DIR_OUT )
   {
-    TU_VERIFY(_control_state.buffer);
-    memcpy(_control_state.buffer, _usbd_ctrl_buf, xferred_bytes);
+    TU_VERIFY(_ctrl_xfer.buffer);
+    memcpy(_ctrl_xfer.buffer, _usbd_ctrl_buf, xferred_bytes);
   }
 
-  _control_state.total_transferred += xferred_bytes;
-  _control_state.buffer = ((uint8_t*)_control_state.buffer) + xferred_bytes;
-
-  if ( (_control_state.request.wLength == _control_state.total_transferred) || xferred_bytes < CFG_TUD_ENDPOINT0_SIZE )
+  _ctrl_xfer.total_transferred += xferred_bytes;
+  _ctrl_xfer.buffer = ((uint8_t*)_ctrl_xfer.buffer) + xferred_bytes;
 
+  if ( (_ctrl_xfer.request.wLength == _ctrl_xfer.total_transferred) || xferred_bytes < CFG_TUD_ENDPOINT0_SIZE )
   {
     // DATA stage is complete
     bool is_ok = true;
 
     // invoke complete callback if set
     // callback can still stall control in status phase e.g out data does not make sense
-    if ( _control_state.complete_cb )
+    if ( _ctrl_xfer.complete_cb )
     {
-      is_ok = _control_state.complete_cb(rhport, &_control_state.request);
+      is_ok = _ctrl_xfer.complete_cb(rhport, &_ctrl_xfer.request);
     }
 
     if ( is_ok )
     {
       // Send status
-      TU_ASSERT( tud_control_status(rhport, &_control_state.request) );
+      TU_ASSERT( tud_control_status(rhport, &_ctrl_xfer.request) );
     }else
     {
       // Stall both IN and OUT control endpoint

From d9ba4d90a8e8e59c111de814acdc7b2cc7ca5bf8 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 12:26:36 +0700
Subject: [PATCH 03/14] move function around, more rename

---
 src/device/usbd_control.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 7c970d60..7636f459 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -53,11 +53,10 @@ static usbd_control_xfer_t _ctrl_xfer;
 
 CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
 
-void usbd_control_reset (uint8_t rhport)
-{
-  (void) rhport;
-  tu_varclr(&_ctrl_xfer);
-}
+
+//--------------------------------------------------------------------+
+// Application API
+//--------------------------------------------------------------------+
 
 bool tud_control_status(uint8_t rhport, tusb_control_request_t const * request)
 {
@@ -66,7 +65,7 @@ bool tud_control_status(uint8_t rhport, tusb_control_request_t const * request)
 }
 
 // Each transaction is up to endpoint0's max packet size
-static bool start_control_data_xact(uint8_t rhport)
+static bool _ctrl_data_xact(uint8_t rhport)
 {
   uint16_t const xact_len = tu_min16(_ctrl_xfer.len - _ctrl_xfer.total_transferred, CFG_TUD_ENDPOINT0_SIZE);
 
@@ -81,12 +80,6 @@ static bool start_control_data_xact(uint8_t rhport)
   return dcd_edpt_xfer(rhport, ep_addr, _usbd_ctrl_buf, xact_len);
 }
 
-// TODO may find a better way
-void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_request_t const * ) )
-{
-  _ctrl_xfer.complete_cb = fp;
-}
-
 bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, void* buffer, uint16_t len)
 {
   _ctrl_xfer.request = (*request);
@@ -99,7 +92,7 @@ bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, vo
     TU_ASSERT(buffer);
 
     // Data stage
-    TU_ASSERT( start_control_data_xact(rhport) );
+    TU_ASSERT( _ctrl_data_xact(rhport) );
   }else
   {
     // Status stage
@@ -109,6 +102,22 @@ bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, vo
   return true;
 }
 
+//--------------------------------------------------------------------+
+// USBD API
+//--------------------------------------------------------------------+
+
+void usbd_control_reset (uint8_t rhport)
+{
+  (void) rhport;
+  tu_varclr(&_ctrl_xfer);
+}
+
+// TODO may find a better way
+void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_request_t const * ) )
+{
+  _ctrl_xfer.complete_cb = fp;
+}
+
 // callback when a transaction complete on DATA stage of control endpoint
 bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes)
 {
@@ -150,7 +159,7 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
   else
   {
     // More data to transfer
-    TU_ASSERT( start_control_data_xact(rhport) );
+    TU_ASSERT( _ctrl_data_xact(rhport) );
   }
 
   return true;

From 6de9eb4b1a6bb84832ce4a55f050763d05f8a6b3 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 13:06:57 +0700
Subject: [PATCH 04/14] add more tests, fix an issue with
 tud_descriptor_configuration_cb() return NULL

---
 src/device/usbd.c                 |  2 +
 test/test/device/usbd/test_usbd.c | 72 ++++++++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 46affdab..2d2f1caf 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -785,6 +785,8 @@ static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const
     case TUSB_DESC_CONFIGURATION:
     {
       tusb_desc_configuration_t const* desc_config = (tusb_desc_configuration_t const*) tud_descriptor_configuration_cb(desc_index);
+      TU_ASSERT(desc_config);
+
       uint16_t total_len;
       memcpy(&total_len, &desc_config->wTotalLength, 2); // possibly mis-aligned memory
 
diff --git a/test/test/device/usbd/test_usbd.c b/test/test/device/usbd/test_usbd.c
index d4b3f806..b58a79a8 100644
--- a/test/test/device/usbd/test_usbd.c
+++ b/test/test/device/usbd/test_usbd.c
@@ -40,7 +40,7 @@ TEST_FILE("usbd_control.c")
 
 uint8_t const rhport = 0;
 
-tusb_desc_device_t const desc_device =
+tusb_desc_device_t const data_desc_device =
 {
     .bLength            = sizeof(tusb_desc_device_t),
     .bDescriptorType    = TUSB_DESC_DEVICE,
@@ -65,6 +65,12 @@ tusb_desc_device_t const desc_device =
     .bNumConfigurations = 0x01
 };
 
+uint8_t const data_desc_configuration[] =
+{
+  // Interface count, string index, total length, attribute, power in mA
+  TUD_CONFIG_DESCRIPTOR(0, 0, TUD_CONFIG_DESC_LEN, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
+};
+
 tusb_control_request_t const req_get_desc_device =
 {
   .bmRequestType = 0x80,
@@ -74,20 +80,29 @@ tusb_control_request_t const req_get_desc_device =
   .wLength = 64
 };
 
+tusb_control_request_t const req_get_desc_configuration =
+{
+  .bmRequestType = 0x80,
+  .bRequest = TUSB_REQ_GET_DESCRIPTOR,
+  .wValue = (TUSB_DESC_CONFIGURATION << 8),
+  .wIndex = 0x0000,
+  .wLength = 256
+};
+
+uint8_t const* desc_device;
+uint8_t const* desc_configuration;
+
 //--------------------------------------------------------------------+
 //
 //--------------------------------------------------------------------+
-uint8_t const * ptr_desc_device;
-
 uint8_t const * tud_descriptor_device_cb(void)
 {
-  return ptr_desc_device;
+  return desc_device;
 }
 
 uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
 {
-  TEST_FAIL();
-  return NULL;
+  return desc_configuration;
 }
 
 uint16_t const* tud_descriptor_string_cb(uint8_t index)
@@ -105,8 +120,6 @@ void setUp(void)
     dcd_init_Expect(rhport);
     tusb_init();
   }
-
-  ptr_desc_device = (uint8_t const *) &desc_device;
 }
 
 void tearDown(void)
@@ -114,20 +127,23 @@ void tearDown(void)
 }
 
 //--------------------------------------------------------------------+
-//
+// Get Descriptor
 //--------------------------------------------------------------------+
+
+//------------- Device -------------//
 void test_usbd_get_device_descriptor(void)
 {
+  desc_device = (uint8_t const *) &data_desc_device;
   dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_device, false);
 
-  dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, 0x80, (uint8_t*)&desc_device, sizeof(tusb_desc_device_t), sizeof(tusb_desc_device_t), true);
+  dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, 0x80, (uint8_t*)&data_desc_device, sizeof(tusb_desc_device_t), sizeof(tusb_desc_device_t), true);
 
   tud_task();
 }
 
 void test_usbd_get_device_descriptor_null(void)
 {
-  ptr_desc_device = NULL;
+  desc_device = NULL;
 
   dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_device, false);
 
@@ -136,3 +152,37 @@ void test_usbd_get_device_descriptor_null(void)
 
   tud_task();
 }
+
+//------------- Configuration -------------//
+
+void test_usbd_get_configuration_descriptor(void)
+{
+  desc_configuration = data_desc_configuration;
+  uint16_t total_len = ((tusb_desc_configuration_t const*) data_desc_configuration)->wTotalLength;
+
+  dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_configuration, false);
+
+  dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, 0x80, (uint8_t*) data_desc_configuration, total_len, total_len, true);
+
+  tud_task();
+}
+
+void test_usbd_get_configuration_descriptor_null(void)
+{
+  desc_configuration = NULL;
+  dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_configuration, false);
+
+  dcd_edpt_stall_Expect(rhport, 0);
+  dcd_edpt_stall_Expect(rhport, 0x80);
+
+  tud_task();
+}
+
+//--------------------------------------------------------------------+
+// Control ZLP
+//--------------------------------------------------------------------+
+
+//void test_control_zlp(void)
+//{
+//
+//}

From 6067adcd08df5eabcfb99cd62611835dc1738c90 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 16:42:51 +0700
Subject: [PATCH 05/14] adeded tests for zlp

---
 test/test/device/usbd/test_usbd.c | 63 +++++++++++++++++++++++++++----
 test/test/support/tusb_config.h   | 11 +++---
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/test/test/device/usbd/test_usbd.c b/test/test/device/usbd/test_usbd.c
index b58a79a8..ea813ea4 100644
--- a/test/test/device/usbd/test_usbd.c
+++ b/test/test/device/usbd/test_usbd.c
@@ -38,6 +38,12 @@ TEST_FILE("usbd_control.c")
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
 
+enum
+{
+  EDPT_CTRL_OUT = 0x00,
+  EDPT_CTRL_IN  = 0x80
+};
+
 uint8_t const rhport = 0;
 
 tusb_desc_device_t const data_desc_device =
@@ -136,7 +142,12 @@ void test_usbd_get_device_descriptor(void)
   desc_device = (uint8_t const *) &data_desc_device;
   dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_device, false);
 
+  // data
   dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, 0x80, (uint8_t*)&data_desc_device, sizeof(tusb_desc_device_t), sizeof(tusb_desc_device_t), true);
+  dcd_event_xfer_complete(rhport, EDPT_CTRL_IN, sizeof(tusb_desc_device_t), 0, false);
+
+  // status
+  dcd_edpt_xfer_ExpectAndReturn(rhport, EDPT_CTRL_OUT, NULL, 0, true);
 
   tud_task();
 }
@@ -147,8 +158,8 @@ void test_usbd_get_device_descriptor_null(void)
 
   dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_device, false);
 
-  dcd_edpt_stall_Expect(rhport, 0);
-  dcd_edpt_stall_Expect(rhport, 0x80);
+  dcd_edpt_stall_Expect(rhport, EDPT_CTRL_OUT);
+  dcd_edpt_stall_Expect(rhport, EDPT_CTRL_IN);
 
   tud_task();
 }
@@ -162,7 +173,12 @@ void test_usbd_get_configuration_descriptor(void)
 
   dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_configuration, false);
 
+  // data
   dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, 0x80, (uint8_t*) data_desc_configuration, total_len, total_len, true);
+  dcd_event_xfer_complete(rhport, EDPT_CTRL_IN, total_len, 0, false);
+
+  // status
+  dcd_edpt_xfer_ExpectAndReturn(rhport, EDPT_CTRL_OUT, NULL, 0, true);
 
   tud_task();
 }
@@ -172,8 +188,8 @@ void test_usbd_get_configuration_descriptor_null(void)
   desc_configuration = NULL;
   dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_configuration, false);
 
-  dcd_edpt_stall_Expect(rhport, 0);
-  dcd_edpt_stall_Expect(rhport, 0x80);
+  dcd_edpt_stall_Expect(rhport, EDPT_CTRL_OUT);
+  dcd_edpt_stall_Expect(rhport, EDPT_CTRL_IN);
 
   tud_task();
 }
@@ -182,7 +198,38 @@ void test_usbd_get_configuration_descriptor_null(void)
 // Control ZLP
 //--------------------------------------------------------------------+
 
-//void test_control_zlp(void)
-//{
-//
-//}
+void test_usbd_control_zlp(void)
+{
+  // 128 byte total len, with EP0 size = 64, and request length = 256
+  // ZLP must be return
+  uint8_t zlp_desc_configuration[] =
+  {
+    // Interface count, string index, total length, attribute, power in mA
+    TUD_CONFIG_DESCRIPTOR(0, 0, CFG_TUD_ENDOINT0_SIZE*2, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
+  };
+
+  desc_configuration = zlp_desc_configuration;
+
+  // request, then 1st, 2nd xact + ZLP + status
+  dcd_event_setup_received(rhport, (uint8_t*) &req_get_desc_configuration, false);
+
+  // 1st transaction
+  dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, EDPT_CTRL_IN,
+                                         zlp_desc_configuration, CFG_TUD_ENDOINT0_SIZE, CFG_TUD_ENDOINT0_SIZE, true);
+  dcd_event_xfer_complete(rhport, EDPT_CTRL_IN, CFG_TUD_ENDOINT0_SIZE, 0, false);
+
+  // 2nd transaction
+  dcd_edpt_xfer_ExpectWithArrayAndReturn(rhport, EDPT_CTRL_IN,
+                                         zlp_desc_configuration + CFG_TUD_ENDOINT0_SIZE, CFG_TUD_ENDOINT0_SIZE, CFG_TUD_ENDOINT0_SIZE, true);
+  dcd_event_xfer_complete(rhport, EDPT_CTRL_IN, CFG_TUD_ENDOINT0_SIZE, 0, false);
+
+  // Expect Zero length Packet
+  dcd_edpt_xfer_ExpectAndReturn(rhport, EDPT_CTRL_IN, NULL, 0, true);
+  dcd_event_xfer_complete(rhport, EDPT_CTRL_IN, 0, 0, false);
+
+  // Status
+  dcd_edpt_xfer_ExpectAndReturn(rhport, EDPT_CTRL_OUT, NULL, 0, true);
+  dcd_event_xfer_complete(rhport, EDPT_CTRL_OUT, 0, 0, false);
+
+  tud_task();
+}
diff --git a/test/test/support/tusb_config.h b/test/test/support/tusb_config.h
index bfe5bf9e..e0ab0c68 100644
--- a/test/test/support/tusb_config.h
+++ b/test/test/support/tusb_config.h
@@ -41,15 +41,15 @@
 #endif
 
 #if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX
-#define CFG_TUSB_RHPORT0_MODE       (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED)
+#define CFG_TUSB_RHPORT0_MODE    (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED)
 #else
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
+#define CFG_TUSB_RHPORT0_MODE    OPT_MODE_DEVICE
 #endif
 
-#define CFG_TUSB_OS                 OPT_OS_NONE
+#define CFG_TUSB_OS              OPT_OS_NONE
 
 // CFG_TUSB_DEBUG is defined by compiler in DEBUG build
-// #define CFG_TUSB_DEBUG           0
+#define CFG_TUSB_DEBUG           0
 
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
  * Tinyusb use follows macros to declare transferring memory so that they can be put
@@ -63,13 +63,14 @@
 #endif
 
 #ifndef CFG_TUSB_MEM_ALIGN
-#define CFG_TUSB_MEM_ALIGN          __attribute__ ((aligned(4)))
+#define CFG_TUSB_MEM_ALIGN       __attribute__ ((aligned(4)))
 #endif
 
 //--------------------------------------------------------------------
 // DEVICE CONFIGURATION
 //--------------------------------------------------------------------
 
+#define CFG_TUD_TASK_QUEUE_SZ    100
 #define CFG_TUD_ENDOINT0_SIZE    64
 
 //------------- CLASS -------------//

From cacbb80a9031662074c12652cbec32b491d78507 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 21:14:06 +0700
Subject: [PATCH 06/14] zlp should work with control in, tested with Unity
 framework

---
 src/device/usbd.c                 |  5 ----
 src/device/usbd_control.c         | 48 +++++++++++++++++++------------
 test/test/device/usbd/test_usbd.c |  2 +-
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 2d2f1caf..0b9713e9 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -404,7 +404,6 @@ void tud_task (void)
 
         if ( 0 == epnum )
         {
-          // control transfer DATA stage callback
           usbd_control_xfer_cb(event.rhport, ep_addr, event.xfer_complete.result, event.xfer_complete.len);
         }
         else
@@ -869,10 +868,6 @@ void dcd_event_handler(dcd_event_t const * event, bool in_isr)
     break;
 
     case DCD_EVENT_XFER_COMPLETE:
-      // skip zero-length control status complete event, should DCD notify us.
-      // TODO could cause issue with actual zero length data used by class such as DFU
-      if ( (0 == tu_edpt_number(event->xfer_complete.ep_addr)) && (event->xfer_complete.len == 0) ) break;
-
       osal_queue_send(_usbd_q, event, in_isr);
       TU_ASSERT(event->xfer_complete.result == XFER_RESULT_SUCCESS,);
     break;
diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index 7636f459..27e2a821 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -42,9 +42,9 @@ typedef struct
 {
   tusb_control_request_t request;
 
-  void* buffer;
-  uint16_t len;
-  uint16_t total_transferred;
+  uint8_t* buffer;
+  uint16_t data_len;
+  uint16_t total_xferred;
 
   bool (*complete_cb) (uint8_t, tusb_control_request_t const *);
 } usbd_control_xfer_t;
@@ -64,35 +64,37 @@ bool tud_control_status(uint8_t rhport, tusb_control_request_t const * request)
   return dcd_edpt_xfer(rhport, request->bmRequestType_bit.direction ? EDPT_CTRL_OUT : EDPT_CTRL_IN, NULL, 0);
 }
 
-// Each transaction is up to endpoint0's max packet size
-static bool _ctrl_data_xact(uint8_t rhport)
+// Transfer an transaction in Data Stage
+// Each transaction has up to Endpoint0's max packet size.
+// This function can also transfer an zero-length packet
+static bool _data_stage_xact(uint8_t rhport)
 {
-  uint16_t const xact_len = tu_min16(_ctrl_xfer.len - _ctrl_xfer.total_transferred, CFG_TUD_ENDPOINT0_SIZE);
+  uint16_t const xact_len = tu_min16(_ctrl_xfer.data_len - _ctrl_xfer.total_xferred, CFG_TUD_ENDPOINT0_SIZE);
 
   uint8_t ep_addr = EDPT_CTRL_OUT;
 
   if ( _ctrl_xfer.request.bmRequestType_bit.direction == TUSB_DIR_IN )
   {
     ep_addr = EDPT_CTRL_IN;
-    memcpy(_usbd_ctrl_buf, _ctrl_xfer.buffer, xact_len);
+    if ( xact_len ) memcpy(_usbd_ctrl_buf, _ctrl_xfer.buffer, xact_len);
   }
 
-  return dcd_edpt_xfer(rhport, ep_addr, _usbd_ctrl_buf, xact_len);
+  return dcd_edpt_xfer(rhport, ep_addr, xact_len ? _usbd_ctrl_buf : NULL, xact_len);
 }
 
 bool tud_control_xfer(uint8_t rhport, tusb_control_request_t const * request, void* buffer, uint16_t len)
 {
-  _ctrl_xfer.request = (*request);
-  _ctrl_xfer.buffer = buffer;
-  _ctrl_xfer.total_transferred = 0;
-  _ctrl_xfer.len = tu_min16(len, request->wLength);
+  _ctrl_xfer.request       = (*request);
+  _ctrl_xfer.buffer        = (uint8_t*) buffer;
+  _ctrl_xfer.total_xferred = 0;
+  _ctrl_xfer.data_len      = tu_min16(len, request->wLength);
 
-  if ( len )
+  if ( _ctrl_xfer.data_len )
   {
     TU_ASSERT(buffer);
 
     // Data stage
-    TU_ASSERT( _ctrl_data_xact(rhport) );
+    TU_ASSERT( _data_stage_xact(rhport) );
   }else
   {
     // Status stage
@@ -122,7 +124,13 @@ void usbd_control_set_complete_callback( bool (*fp) (uint8_t, tusb_control_reque
 bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes)
 {
   (void) result;
-  (void) ep_addr;
+
+  // Endpoint Address is opposite to direction bit, this is Status Stage complete event
+  if ( tu_edpt_dir(ep_addr) != _ctrl_xfer.request.bmRequestType_bit.direction )
+  {
+    TU_ASSERT(0 == xferred_bytes);
+    return true;
+  }
 
   if ( _ctrl_xfer.request.bmRequestType_bit.direction == TUSB_DIR_OUT )
   {
@@ -130,10 +138,12 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
     memcpy(_ctrl_xfer.buffer, _usbd_ctrl_buf, xferred_bytes);
   }
 
-  _ctrl_xfer.total_transferred += xferred_bytes;
-  _ctrl_xfer.buffer = ((uint8_t*)_ctrl_xfer.buffer) + xferred_bytes;
+  _ctrl_xfer.total_xferred += xferred_bytes;
+  _ctrl_xfer.buffer += xferred_bytes;
 
-  if ( (_ctrl_xfer.request.wLength == _ctrl_xfer.total_transferred) || xferred_bytes < CFG_TUD_ENDPOINT0_SIZE )
+  // Data Stage is complete when all request's length are transferred or
+  // a short packet is sent including zero-length packet.
+  if ( (_ctrl_xfer.request.wLength == _ctrl_xfer.total_xferred) || xferred_bytes < CFG_TUD_ENDPOINT0_SIZE )
   {
     // DATA stage is complete
     bool is_ok = true;
@@ -159,7 +169,7 @@ bool usbd_control_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t result
   else
   {
     // More data to transfer
-    TU_ASSERT( _ctrl_data_xact(rhport) );
+    TU_ASSERT( _data_stage_xact(rhport) );
   }
 
   return true;
diff --git a/test/test/device/usbd/test_usbd.c b/test/test/device/usbd/test_usbd.c
index ea813ea4..71d15dbc 100644
--- a/test/test/device/usbd/test_usbd.c
+++ b/test/test/device/usbd/test_usbd.c
@@ -202,7 +202,7 @@ void test_usbd_control_zlp(void)
 {
   // 128 byte total len, with EP0 size = 64, and request length = 256
   // ZLP must be return
-  uint8_t zlp_desc_configuration[] =
+  uint8_t zlp_desc_configuration[CFG_TUD_ENDOINT0_SIZE*2] =
   {
     // Interface count, string index, total length, attribute, power in mA
     TUD_CONFIG_DESCRIPTOR(0, 0, CFG_TUD_ENDOINT0_SIZE*2, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),

From f58726887a58fe60d7384136f78b5b147fb08fbd Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 21:28:46 +0700
Subject: [PATCH 07/14] update doc, hid set report

---
 docs/porting.md                 | 10 +++-------
 src/class/hid/hid_device.c      |  3 +--
 test/test/support/tusb_config.h | 10 +++++-----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/docs/porting.md b/docs/porting.md
index ded35e7b..7fdeaeba 100644
--- a/docs/porting.md
+++ b/docs/porting.md
@@ -123,17 +123,13 @@ Also make sure to enable endpoint specific interrupts.
 
 ##### dcd_edpt_xfer
 
-`dcd_edpt_xfer` is responsible for configuring the peripheral to send or receive data from the host. "xfer" is short for "transfer". **This is one of the core methods you must implement for TinyUSB to work (one other is the interrupt handler).**  Data from the host is the OUT direction and data to the host is IN. In other words, direction is relative to the host.
-
-`dcd_edpt_xfer` is used for all endpoints including the control endpoint 0. Make sure to handle the zero-length packet STATUS packet on endpoint 0 correctly. It may be a special transaction to the peripheral.
+`dcd_edpt_xfer` is responsible for configuring the peripheral to send or receive data from the host. "xfer" is short for "transfer". **This is one of the core methods you must implement for TinyUSB to work (one other is the interrupt handler).**  Data from the host is the OUT direction and data to the host is IN. It  is used for all endpoints including the control endpoint 0. Make sure to handle the zero-length packet STATUS packet on endpoint 0 correctly. It may be a special transaction to the peripheral.
 
 Besides that, all other transactions are relatively straight-forward. The endpoint address provides the endpoint
 number and direction which usually determines where to write the buffer info. The buffer and its length are usually
 written to a specific location in memory and the peripheral is told the data is valid. (Maybe by writing a 1 to a
 register or setting a counter register to 0 for OUT or length for IN.)
 
-The transmit buffer is NOT guarenteed to be word-aligned.
-
 One potential pitfall is that the buffer may be longer than the maximum endpoint size of one USB
 packet. Some peripherals can handle transmitting multiple USB packets for a provided buffer (like the SAMD21).
 Others (like the nRF52) may need each USB packet queued individually. To make this work you'll need to track
@@ -143,11 +139,11 @@ Once the transaction is going, the interrupt handler will notify TinyUSB of tran
 During transmission, the IN data buffer is guarenteed to remain unchanged in memory until the `dcd_xfer_complete` function is called.
 
 The dcd_edpt_xfer function must never add zero-length-packets (ZLP) on its own to a transfer. If a ZLP is required,
-then it must be explicitly sent by the module calling dcd_edpt_xfer(), by calling dcd_edpt_xfer() a second time with len=0.
+then it must be explicitly sent by the stack calling dcd_edpt_xfer(), by calling dcd_edpt_xfer() a second time with len=0.
 For control transfers, this is automatically done in `usbd_control.c`.
 
 At the moment, only a single buffer can be transmitted at once. There is no provision for double-buffering. new dcd_edpt_xfer() will not
-be called again until the driver calls dcd_xfer_complete() (except in cases of USB resets).
+be called again on the same endpoint address until the driver calls dcd_xfer_complete() (except in cases of USB resets).
 
 ##### dcd_xfer_complete
 
diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 9e7bad97..558adc2b 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -241,8 +241,7 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
       break;
 
       case  HID_REQ_CONTROL_SET_REPORT:
-        TU_VERIFY(p_request->wLength <=sizeof(p_hid->epout_buf));
-        tud_control_xfer(rhport, p_request, p_hid->epout_buf, p_request->wLength);
+        tud_control_xfer(rhport, p_request, p_hid->epout_buf, tu_min16(sizeof(p_hid->epout_buf), p_request->wLength));
       break;
 
       case HID_REQ_CONTROL_SET_IDLE:
diff --git a/test/test/support/tusb_config.h b/test/test/support/tusb_config.h
index e0ab0c68..0a1608a6 100644
--- a/test/test/support/tusb_config.h
+++ b/test/test/support/tusb_config.h
@@ -74,11 +74,11 @@
 #define CFG_TUD_ENDOINT0_SIZE    64
 
 //------------- CLASS -------------//
-#define CFG_TUD_CDC              0
-#define CFG_TUD_MSC              0
-#define CFG_TUD_HID              0
-#define CFG_TUD_MIDI             0
-#define CFG_TUD_VENDOR           0
+//#define CFG_TUD_CDC              0
+//#define CFG_TUD_MSC              0
+//#define CFG_TUD_HID              0
+//#define CFG_TUD_MIDI             0
+//#define CFG_TUD_VENDOR           0
 
 //------------- CDC -------------//
 

From bd8b4e48dc4a7430fa1e03f298a86bb0b7135c31 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 31 Oct 2019 21:55:01 +0700
Subject: [PATCH 08/14] rename zlp test

---
 test/test/device/usbd/test_usbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/device/usbd/test_usbd.c b/test/test/device/usbd/test_usbd.c
index 71d15dbc..add947b3 100644
--- a/test/test/device/usbd/test_usbd.c
+++ b/test/test/device/usbd/test_usbd.c
@@ -198,7 +198,7 @@ void test_usbd_get_configuration_descriptor_null(void)
 // Control ZLP
 //--------------------------------------------------------------------+
 
-void test_usbd_control_zlp(void)
+void test_usbd_control_in_zlp(void)
 {
   // 128 byte total len, with EP0 size = 64, and request length = 256
   // ZLP must be return

From 981e64d8a175463d8788c8bf2cb98ce97b630814 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 1 Nov 2019 10:07:56 +0700
Subject: [PATCH 09/14] implement pigrew review

---
 src/class/hid/hid_device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 558adc2b..fc2e6b35 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -241,7 +241,8 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
       break;
 
       case  HID_REQ_CONTROL_SET_REPORT:
-        tud_control_xfer(rhport, p_request, p_hid->epout_buf, tu_min16(sizeof(p_hid->epout_buf), p_request->wLength));
+        TU_VERIFY(p_request->wLength <= sizeof(p_hid->epout_buf));
+        tud_control_xfer(rhport, p_request, p_hid->epout_buf, p_request->wLength);
       break;
 
       case HID_REQ_CONTROL_SET_IDLE:

From ac0203b42f74bfa6e9c267af179f9b8622412a70 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 1 Nov 2019 10:13:19 +0700
Subject: [PATCH 10/14] update doc

---
 docs/porting.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/porting.md b/docs/porting.md
index 7fdeaeba..a38ff019 100644
--- a/docs/porting.md
+++ b/docs/porting.md
@@ -130,6 +130,8 @@ number and direction which usually determines where to write the buffer info. Th
 written to a specific location in memory and the peripheral is told the data is valid. (Maybe by writing a 1 to a
 register or setting a counter register to 0 for OUT or length for IN.)
 
+The transmit buffer alignment is determined by `CFG_TUSB_MEM_ALIGN`.
+
 One potential pitfall is that the buffer may be longer than the maximum endpoint size of one USB
 packet. Some peripherals can handle transmitting multiple USB packets for a provided buffer (like the SAMD21).
 Others (like the nRF52) may need each USB packet queued individually. To make this work you'll need to track

From 7bf01e218d8325bda8f33ab1bf0649b33282c5b5 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 3 Nov 2019 11:43:07 +0700
Subject: [PATCH 11/14] make control buf static

---
 src/device/usbd_control.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index d9eb2519..80648fd7 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -51,7 +51,7 @@ typedef struct
 
 static usbd_control_xfer_t _ctrl_xfer;
 
-CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
+CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
 
 
 //--------------------------------------------------------------------+

From 585aebeb12d14616c413491653b23aa41f173d88 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 3 Nov 2019 12:54:05 +0700
Subject: [PATCH 12/14] add uart support for stm32f072disco

---
 hw/bsp/stm32f072disco/board.mk             |  3 +-
 hw/bsp/stm32f072disco/stm32f072disco.c     | 50 ++++++++++++++++++----
 hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h |  4 +-
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/hw/bsp/stm32f072disco/board.mk b/hw/bsp/stm32f072disco/board.mk
index 6529763e..39715e83 100644
--- a/hw/bsp/stm32f072disco/board.mk
+++ b/hw/bsp/stm32f072disco/board.mk
@@ -24,7 +24,8 @@ SRC_C += \
 	$(ST_HAL_DRIVER)/Src/stm32f0xx_hal_cortex.c \
 	$(ST_HAL_DRIVER)/Src/stm32f0xx_hal_rcc.c \
 	$(ST_HAL_DRIVER)/Src/stm32f0xx_hal_rcc_ex.c \
-	$(ST_HAL_DRIVER)/Src/stm32f0xx_hal_gpio.c
+	$(ST_HAL_DRIVER)/Src/stm32f0xx_hal_gpio.c \
+	$(ST_HAL_DRIVER)/Src/stm32f0xx_hal_uart.c
 
 SRC_S += \
 	$(ST_CMSIS)/Source/Templates/gcc/startup_stm32f072xb.s
diff --git a/hw/bsp/stm32f072disco/stm32f072disco.c b/hw/bsp/stm32f072disco/stm32f072disco.c
index 46cb0949..aac1c553 100644
--- a/hw/bsp/stm32f072disco/stm32f072disco.c
+++ b/hw/bsp/stm32f072disco/stm32f072disco.c
@@ -37,6 +37,24 @@
 #define BUTTON_PIN            GPIO_PIN_0
 #define BUTTON_STATE_ACTIVE   1
 
+#define UARTx                 USART1
+#define UART_GPIO_PORT        GPIOA
+#define UART_GPIO_AF          GPIO_AF1_USART1
+#define UART_TX_PIN           GPIO_PIN_9
+#define UART_RX_PIN           GPIO_PIN_10
+
+
+UART_HandleTypeDef UartHandle;
+
+// enable all LED, Button, Uart, USB clock
+static void all_rcc_clk_enable(void)
+{
+  __HAL_RCC_GPIOA_CLK_ENABLE();  // USB D+, D-
+  __HAL_RCC_GPIOC_CLK_ENABLE();  // LED
+  //__HAL_RCC_GPIOA_CLK_ENABLE();  // Button
+  //__HAL_RCC_GPIOA_CLK_ENABLE();  // Uart tx, rx
+  __HAL_RCC_USART1_CLK_ENABLE(); // Uart module
+}
 
 /**
   * @brief  System Clock Configuration
@@ -83,12 +101,11 @@ void board_init(void)
   #endif
 
   SystemClock_Config();
-  
-  // Notify runtime of frequency change.
   SystemCoreClockUpdate();
+  
+  all_rcc_clk_enable();
 
   // LED
-  __HAL_RCC_GPIOC_CLK_ENABLE();
   GPIO_InitTypeDef  GPIO_InitStruct;
   GPIO_InitStruct.Pin = LED_PIN;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -97,16 +114,32 @@ void board_init(void)
   HAL_GPIO_Init(LED_PORT, &GPIO_InitStruct);
 
   // Button
-  __HAL_RCC_GPIOA_CLK_ENABLE();
   GPIO_InitStruct.Pin = BUTTON_PIN;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLDOWN;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(BUTTON_PORT, &GPIO_InitStruct);
 
+  // Uart
+  GPIO_InitStruct.Pin       = UART_TX_PIN | UART_RX_PIN;
+  GPIO_InitStruct.Mode      = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull      = GPIO_PULLUP;
+  GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_HIGH;
+  GPIO_InitStruct.Alternate = UART_GPIO_AF;
+  HAL_GPIO_Init(UART_GPIO_PORT, &GPIO_InitStruct);
+
+  UartHandle.Instance        = UARTx;
+  UartHandle.Init.BaudRate   = CFG_BOARD_UART_BAUDRATE;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits   = UART_STOPBITS_1;
+  UartHandle.Init.Parity     = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl  = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode       = UART_MODE_TX_RX;
+  UartHandle.Init.OverSampling = UART_OVERSAMPLING_16;
+  HAL_UART_Init(&UartHandle);
+
   // USB Pins
   // Configure USB DM and DP pins. This is optional, and maintained only for user guidance.
-  __HAL_RCC_GPIOA_CLK_ENABLE();
   GPIO_InitStruct.Pin = (GPIO_PIN_11 | GPIO_PIN_12);
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -139,8 +172,8 @@ int board_uart_read(uint8_t* buf, int len)
 
 int board_uart_write(void const * buf, int len)
 {
-  (void) buf; (void) len;
-  return 0;
+  HAL_UART_Transmit(&UartHandle, (uint8_t*) buf, len, 0xffff);
+  return len;
 }
 
 #if CFG_TUSB_OS  == OPT_OS_NONE
@@ -170,7 +203,8 @@ void HardFault_Handler (void)
   * @retval None
   */
 void assert_failed(char *file, uint32_t line)
-{ 
+{
+  (void) file; (void) line;
   /* USER CODE BEGIN 6 */
   /* User can add his own implementation to report the file name and line number,
      tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
diff --git a/hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h b/hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h
index 7e3721af..d001f252 100644
--- a/hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h
+++ b/hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h
@@ -66,8 +66,8 @@
 /*#define HAL_RTC_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_TIM_MODULE_ENABLED   */
-/*#define HAL_UART_MODULE_ENABLED   */
-#define HAL_USART_MODULE_ENABLED   
+#define HAL_UART_MODULE_ENABLED
+//#define HAL_USART_MODULE_ENABLED
 /*#define HAL_IRDA_MODULE_ENABLED   */
 /*#define HAL_SMARTCARD_MODULE_ENABLED   */
 /*#define HAL_SMBUS_MODULE_ENABLED   */

From 5ca75eb84ced12d54975146b0646244aa1ffe2a1 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 3 Nov 2019 13:18:02 +0700
Subject: [PATCH 13/14] seperate DEBUG from LOG

---
 examples/make.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/make.mk b/examples/make.mk
index b736b877..c2e0559f 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -79,11 +79,16 @@ CFLAGS += \
 
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
-  CFLAGS += -Og -ggdb -DCFG_TUSB_DEBUG=2
+  CFLAGS += -Og -ggdb
 else
-ifneq ($(BOARD), spresense)
-  CFLAGS += -flto -Os
-else
-  CFLAGS += -Os
+  ifneq ($(BOARD),spresense)
+    CFLAGS += -flto -Os
+  else
+    CFLAGS += -Os
+  endif
 endif
+
+# TUSB Logging option
+ifneq ($(LOG),)
+  CFLAGS += -DCFG_TUSB_DEBUG=$(LOG)
 endif

From 62f8c14fae1c7c2f7d5cd5246e18f305d638f5f6 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 3 Nov 2019 14:08:38 +0700
Subject: [PATCH 14/14] add a bit of log1 for debugging

---
 src/device/usbd.c    | 4 +++-
 src/osal/osal_none.h | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 0b9713e9..99741690 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -376,7 +376,7 @@ void tud_task (void)
 
       case DCD_EVENT_SETUP_RECEIVED:
         TU_LOG2("  ");
-        TU_LOG2_MEM(&event.setup_received, 1, 8);
+        TU_LOG1_MEM(&event.setup_received, 1, 8);
 
         // Mark as connected after receiving 1st setup packet.
         // But it is easier to set it every time instead of wasting time to check then set
@@ -385,6 +385,7 @@ void tud_task (void)
         // Process control request
         if ( !process_control_request(event.rhport, &event.setup_received) )
         {
+          TU_LOG1("  Stall EP0\r\n");
           // Failed -> stall both control endpoint IN and OUT
           dcd_edpt_stall(event.rhport, 0);
           dcd_edpt_stall(event.rhport, 0 | TUSB_DIR_IN_MASK);
@@ -404,6 +405,7 @@ void tud_task (void)
 
         if ( 0 == epnum )
         {
+          TU_LOG1("  EP Addr = 0x%02X, len = %ld\r\n", ep_addr, event.xfer_complete.len);
           usbd_control_xfer_cb(event.rhport, ep_addr, event.xfer_complete.result, event.xfer_complete.len);
         }
         else
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index fa581215..5868dfb3 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -198,6 +198,8 @@ static inline bool osal_queue_send(osal_queue_t const qhdl, void const * data, b
     _osal_q_unlock(qhdl);
   }
 
+  TU_ASSERT(success);
+
   return success;
 }