replace board_millis() with tusb_time_millis_api()

5 files changed, 15 insertions, 19 deletions

diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h
index 9eb0a9337..6ac1405f3 100644
--- a/src/common/tusb_common.h
+++ b/src/common/tusb_common.h
@@ -90,6 +90,12 @@
 // TODO move to a more obvious place/file
 //--------------------------------------------------------------------+
 
+// Get current milliseconds, required by some port/configuration without RTOS
+extern uint32_t tusb_time_millis_api(void);
+
+// Delay in milliseconds, use tusb_time_millis_api() by default. required by some port/configuration with no RTOS
+extern void tusb_time_delay_ms_api(uint32_t ms);
+
 // flush data cache
 extern void tusb_app_dcache_flush(uintptr_t addr, uint32_t data_size);
 
diff --git a/src/host/usbh.c b/src/host/usbh.c
index 60d78605f..0da5166c2 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -685,7 +685,7 @@ void tuh_task_ext(uint32_t timeout_ms, bool in_isr) {
       has_deferred_attach = osal_queue_receive(_usbh_daq, &event, 0);
     }
 
-    if (!has_deferred_attach) // skip event queue to process deferred at
+    if (!has_deferred_attach) // skip event queue to process deferred attach
   #endif
     {
       if (!osal_queue_receive(_usbh_q, &event, timeout_ms)) {
diff --git a/src/portable/sunxi/dcd_sunxi_musb.c b/src/portable/sunxi/dcd_sunxi_musb.c
index b413121a5..9fac0bc1c 100644
--- a/src/portable/sunxi/dcd_sunxi_musb.c
+++ b/src/portable/sunxi/dcd_sunxi_musb.c
@@ -36,9 +36,6 @@
 #include <device/dcd.h>
 #include "musb_def.h"
 
-//#include "bsp/board_api.h"
-extern uint32_t board_millis(void); // TODO remove
-
 typedef uint32_t u32;
 typedef uint16_t u16;
 typedef uint8_t u8;
diff --git a/src/tusb.c b/src/tusb.c
index 40d0e8adf..37aecf693 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -45,21 +45,24 @@ tusb_role_t _tusb_rhport_role[TUP_USBIP_CONTROLLER_NUM] = { TUSB_ROLE_INVALID };
 // Weak/Default API, can be overwritten by Application
 //--------------------------------------------------------------------
 
-  #if CFG_TUSB_OS != OPT_OS_NONE
-uint32_t tusb_time_millis_api(void) {
+#if CFG_TUSB_OS != OPT_OS_NONE
+TU_ATTR_WEAK uint32_t tusb_time_millis_api(void) {
   return osal_time_millis();
 }
-  #endif
 
 TU_ATTR_WEAK void tusb_time_delay_ms_api(uint32_t ms) {
-#if CFG_TUSB_OS != OPT_OS_NONE
   osal_task_delay(ms);
+}
+
 #else
+// tusb_time_millis_api() must be implemented by user application.
+
+TU_ATTR_WEAK void tusb_time_delay_ms_api(uint32_t ms) {
   // delay using millis()
   const uint32_t time_ms = tusb_time_millis_api();
   while ((tusb_time_millis_api() - time_ms) < ms) {}
-#endif
 }
+#endif
 
 TU_ATTR_WEAK void *tusb_app_virt_to_phys(void *virt_addr) {
   return virt_addr;
diff --git a/src/tusb.h b/src/tusb.h
index 742009a2e..3876bf863 100644
--- a/src/tusb.h
+++ b/src/tusb.h
@@ -174,16 +174,6 @@ bool tusb_deinit(uint8_t rhport);
 
 #endif
 
-//--------------------------------------------------------------------+
-//
-//--------------------------------------------------------------------+
-
-// Get current milliseconds, required by some port/configuration without RTOS
-extern uint32_t tusb_time_millis_api(void);
-
-// Delay in milliseconds, use tusb_time_millis_api() by default. required by some port/configuration with no RTOS
-extern void tusb_time_delay_ms_api(uint32_t ms);
-
 #ifdef __cplusplus
  }
 #endif