add timeout_timer.h to provide real tick timeout service for blocking control

4 files changed, 92 insertions, 1 deletions

diff --git a/tests/test/host/ehci/test_ehci.c b/tests/test/host/ehci/test_ehci.c
index 83f81787e..c0200e3b0 100644
--- a/tests/test/host/ehci/test_ehci.c
+++ b/tests/test/host/ehci/test_ehci.c
@@ -39,8 +39,10 @@
 #include "tusb_option.h"
 #include "errors.h"
 #include "binary.h"
+#include "mock_osal.h"
 #include "ehci.h"
 
+
 //--------------------------------------------------------------------+
 // Setup/Teardown + helper declare
 //--------------------------------------------------------------------+
diff --git a/tinyusb/common/timeout_timer.h b/tinyusb/common/timeout_timer.h
new file mode 100644
index 000000000..f994b3c3f
--- /dev/null
+++ b/tinyusb/common/timeout_timer.h
@@ -0,0 +1,86 @@
+/*
+ * timeout_timer.h
+ *
+ *  Created on: Dec 7, 2012
+ *      Author: hathach
+ */
+
+/*
+ * Software License Agreement (BSD License)
+ * Copyright (c) 2013, hathach (tinyusb.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the tiny usb stack.
+ */
+
+/** \file
+ *  \brief TBD
+ *
+ *  \note TBD
+ */
+
+/** \ingroup TBD
+ *  \defgroup TBD
+ *  \brief TBD
+ *
+ *  @{
+ */
+
+#ifndef _TUSB_TIMEOUT_TTIMER_H_
+#define _TUSB_TIMEOUT_TTIMER_H_
+
+#include "primitive_types.h"
+#include "compiler/compiler.h"
+#include "osal/osal.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  uint32_t start;
+  uint32_t interval;
+}timeout_timer_t;
+
+static inline void timeout_set(timeout_timer_t* tt, uint32_t msec) ATTR_ALWAYS_INLINE;
+static inline void timeout_set(timeout_timer_t* tt, uint32_t msec)
+{
+  tt->interval = osal_tick_from_msec(msec);
+  tt->start    = osal_tick_get();
+}
+
+static inline bool timeout_expired(timeout_timer_t* tt) ATTR_ALWAYS_INLINE;
+static inline bool timeout_expired(timeout_timer_t* tt)
+{
+  return ( osal_tick_get() - tt->start ) >= tt->interval;
+}
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_TIMEOUT_TTIMER_H_ */
+
+/** @} */
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h
index 594f4908d..b1f67055f 100644
--- a/tinyusb/osal/osal.h
+++ b/tinyusb/osal/osal.h
@@ -164,6 +164,10 @@ osal_queue_handle_t  osal_queue_create  (osal_queue_t *p_queue);
 void                 osal_queue_receive (osal_queue_handle_t const queue_hdl, uint32_t *p_data, uint32_t msec, tusb_error_t *p_error);
 tusb_error_t         osal_queue_send    (osal_queue_handle_t const queue_hdl, uint32_t data);
 
+//--------------------------------------------------------------------+
+// TICK API
+//--------------------------------------------------------------------+
+uint32_t osal_tick_get(void);
 #endif
 
 #ifdef __cplusplus
diff --git a/tinyusb/osal/osal_common.h b/tinyusb/osal/osal_common.h
index f641f970c..55860cb68 100644
--- a/tinyusb/osal/osal_common.h
+++ b/tinyusb/osal/osal_common.h
@@ -56,7 +56,6 @@
 #endif
 
 #include "common/common.h"
-//typedef void (*pfTask)( void * );
 
 enum
 {