clean up include

src/class/hid/hid_device.c

@@ -45,7 +45,6 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/tusb_common.h"
-#include "common/tusb_timeout.h"
 #include "hid_device.h"
 #include "device/usbd_pvt.h"
 

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"
 
 //--------------------------------------------------------------------+

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;

src/host/ehci/ehci.c

@@ -44,7 +44,6 @@
 //--------------------------------------------------------------------+
 #include "hal/hal.h"
 #include "osal/osal.h"
-#include "common/tusb_timeout.h"
 
 #include "../hcd.h"
 #include "../usbh_hcd.h"

src/host/ohci/ohci.c

@@ -44,7 +44,6 @@
 //--------------------------------------------------------------------+
 #include "hal/hal.h"
 #include "osal/osal.h"
-#include "common/tusb_timeout.h"
 
 #include "../hcd.h"
 #include "../usbh_hcd.h"

src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c

@@ -51,7 +51,6 @@
 #include "common/tusb_common.h"
 #include "hal/hal.h"
 #include "osal/osal.h"
-#include "common/tusb_timeout.h"
 
 #include "device/dcd.h"
 #include "usbd_dcd.h"

src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c

@@ -46,7 +46,6 @@
 #include "common/tusb_common.h"
 #include "tusb_hal.h"
 #include "osal/osal.h"
-#include "common/tusb_timeout.h"
 
 #include "device/dcd.h"
 #include "dcd_lpc43xx.h"