diff options
| author | hathach <[email protected]> | 2014-03-17 17:23:32 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-17 17:23:32 +0700 |
| commit | 23aa7070df9b461954d232c25de023cc5228e2e2 (patch) | |
| tree | e9d6460e14fde8f522966f5ee2d797c85372d107 /tinyusb | |
| parent | eaf2e888ab3025b01bf5b8e5b548337dd5bc63ff (diff) | |
refrator, replace osal_tick_get / osal_tick_tock by tusb_tick_get
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/osal/osal_none.c | 2 | ||||
| -rw-r--r-- | tinyusb/osal/osal_none.h | 14 | ||||
| -rw-r--r-- | tinyusb/tusb.h | 9 |
3 files changed, 3 insertions, 22 deletions
diff --git a/tinyusb/osal/osal_none.c b/tinyusb/osal/osal_none.c index 8e1d3d098..e9eaa842a 100644 --- a/tinyusb/osal/osal_none.c +++ b/tinyusb/osal/osal_none.c @@ -51,7 +51,7 @@ //--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
-volatile uint32_t osal_tick_current = 0;
+//volatile uint32_t osal_tick_current = 0;
//--------------------------------------------------------------------+
// IMPLEMENTATION
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 739d1864d..f81e86231 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -56,18 +56,8 @@ //--------------------------------------------------------------------+
// TICK API
//--------------------------------------------------------------------+
-extern volatile uint32_t osal_tick_current;
-static inline void osal_tick_tock(void) ATTR_ALWAYS_INLINE;
-static inline void osal_tick_tock(void)
-{
- osal_tick_current++;
-}
-
-static inline uint32_t osal_tick_get(void) ATTR_ALWAYS_INLINE;
-static inline uint32_t osal_tick_get(void)
-{
- return osal_tick_current;
-}
+uint32_t tusb_tick_get(void);
+#define osal_tick_get tusb_tick_get
//--------------------------------------------------------------------+
// TASK API
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h index a9d624e2b..2630729b6 100644 --- a/tinyusb/tusb.h +++ b/tinyusb/tusb.h @@ -101,19 +101,10 @@ //--------------------------------------------------------------------+
tusb_error_t tusb_init(void);
-// TODO merge with tick_tock
#if TUSB_CFG_OS == TUSB_OS_NONE
void tusb_task_runner(void);
#endif
-#if TUSB_CFG_OS == TUSB_OS_NONE && !defined(_TEST_)
-static inline void tusb_tick_tock(void) ATTR_ALWAYS_INLINE;
-static inline void tusb_tick_tock(void)
-{
- osal_tick_tock();
-}
-#endif
-
#ifdef __cplusplus
}
#endif
|