From 5f7d7a34f576dabd94c10fad05fe5fa85d4ef1e0 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 6 Dec 2018 00:38:00 +0700
Subject: [PATCH] able to complete enumeration with os none blocking

---
 examples/host/cdc_msc_hid/src/main.c        | 23 +++++++++++++++++++--
 examples/host/cdc_msc_hid/src/tusb_config.h |  2 +-
 src/class/cdc/cdc_host.c                    |  4 ++--
 src/osal/osal_none.h                        | 15 +++++++-------
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/examples/host/cdc_msc_hid/src/main.c b/examples/host/cdc_msc_hid/src/main.c
index 2459ec32..c888f7bf 100644
--- a/examples/host/cdc_msc_hid/src/main.c
+++ b/examples/host/cdc_msc_hid/src/main.c
@@ -66,7 +66,7 @@ int main(void)
 
     led_blinking_task();
 
-#if CFG_TUD_CDC
+#if CFG_TUSB_HOST_CDC
     virtual_com_task();
 #endif
 
@@ -81,7 +81,26 @@ int main(void)
 //--------------------------------------------------------------------+
 // USB CDC
 //--------------------------------------------------------------------+
-#if CFG_TUD_CDC
+#if CFG_TUSB_HOST_CDC
+
+void tuh_cdc_mounted_cb(uint8_t dev_addr)
+{
+  // application set-up
+  printf("\na CDC device  (address %d) is mounted\n", dev_addr);
+}
+
+void tuh_cdc_unmounted_cb(uint8_t dev_addr)
+{
+  // application tear-down
+  printf("\na CDC device (address %d) is unmounted \n", dev_addr);
+}
+
+// invoked ISR context
+void tuh_cdc_xfer_isr(uint8_t dev_addr, xfer_result_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes)
+{
+
+}
+
 void virtual_com_task(void)
 {
 
diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index 9fef03af..4b39d6d1 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -88,7 +88,7 @@
 #define CFG_TUSB_HOST_HID_MOUSE         0
 #define CFG_TUSB_HOST_HID_GENERIC       0 // (not yet supported)
 #define CFG_TUSB_HOST_MSC               0
-#define CFG_TUSB_HOST_CDC               0
+#define CFG_TUSB_HOST_CDC               1
 
 #define CFG_TUSB_HOST_DEVICE_MAX        (CFG_TUSB_HOST_HUB ? 5 : 1) // normal hub has 4 ports
 
diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 0a366187..27ef502e 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -144,7 +144,7 @@ void cdch_init(void)
 
 tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)
 {
-  OSAL_SUBTASK_BEGIN
+  //OSAL_SUBTASK_BEGIN
   // TODO change following assert to subtask_assert
 
   if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass) return TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS;
@@ -218,7 +218,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
     tuh_cdc_mounted_cb(dev_addr);
   }
 
-  OSAL_SUBTASK_END
+  //OSAL_SUBTASK_END
 }
 
 void cdch_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes)
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index 042c7a6e..61ed0d45 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -96,15 +96,14 @@ static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl)
   sem_hdl->count = 0;
 }
 
-static inline tusb_error_t osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec) {
+static inline tusb_error_t osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec)
+{
   (void) msec;
-  while (true) {
-    while (sem_hdl->count == 0) { }
-    if (sem_hdl->count == 0) {
-      sem_hdl->count--;
-      break;
-    }
-  }
+
+  // TODO blocking for now
+  while (sem_hdl->count == 0) { }
+  sem_hdl->count--;
+
   return TUSB_ERROR_NONE;
 }