From 5f6cd4903101b0486771efdb2bb435ddf6cf8e7a Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 23 Jul 2018 23:41:14 +0700
Subject: clean up include

---
 src/common/tusb_common.h  |  6 ++----
 src/common/tusb_timeout.h | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/common')

diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h
index ddfceabdb..44f31ffe0 100644
--- a/src/common/tusb_common.h
+++ b/src/common/tusb_common.h
@@ -61,15 +61,13 @@
 //------------- TUSB Option Header -------------//
 #include "tusb_option.h"
 
-//------------- General Header -------------//
+//------------- Common Header -------------//
 #include "tusb_compiler.h"
 #include "tusb_verify.h"
 #include "binary.h"
 #include "tusb_error.h"
-#include "tusb_hal.h"
 #include "tusb_fifo.h"
-
-//------------- TUSB Header -------------//
+#include "tusb_timeout.h"
 #include "tusb_types.h"
 
 //--------------------------------------------------------------------+
diff --git a/src/common/tusb_timeout.h b/src/common/tusb_timeout.h
index 7c51ff36f..9d80f5fe7 100644
--- a/src/common/tusb_timeout.h
+++ b/src/common/tusb_timeout.h
@@ -45,7 +45,6 @@
 #define _TUSB_TIMEOUT_H_
 
 #include "tusb_compiler.h"
-#include "tusb_hal.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,6 +55,8 @@ typedef struct {
   uint32_t interval;
 }tu_timeout_t;
 
+extern uint32_t tusb_hal_millis(void);
+
 static inline void tu_timeout_set(tu_timeout_t* tt, uint32_t msec)
 {
   tt->interval = msec;
@@ -67,6 +68,18 @@ static inline bool tu_timeout_expired(tu_timeout_t* tt)
   return ( tusb_hal_millis() - tt->start ) >= tt->interval;
 }
 
+// For used with periodic event to prevent drift
+static inline void tu_timeout_reset(tu_timeout_t* tt)
+{
+  tt->start += tt->interval;
+}
+
+static inline void tu_timeout_restart(tu_timeout_t* tt)
+{
+  tt->start = tusb_hal_millis();
+}
+
+
 static inline void tu_timeout_wait(uint32_t msec)
 {
   tu_timeout_t tt;
-- 
cgit v1.3.1