diff options
| author | hathach <[email protected]> | 2018-03-30 15:33:36 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-30 15:33:36 +0700 |
| commit | 82da013dadf2b2f69f362702ca40708fdec52df4 (patch) | |
| tree | bfa9a73206ace7aca38dbf008a8277a6ea2d20bc /tinyusb/osal/osal_none.h | |
| parent | 97db3c7c3d7cfbbb19dbda09809aa39bb19608b9 (diff) | |
get freertos build
Diffstat (limited to 'tinyusb/osal/osal_none.h')
| -rw-r--r-- | tinyusb/osal/osal_none.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 0b73de4e9..5325fd29e 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -51,11 +51,6 @@ #endif
//--------------------------------------------------------------------+
-// TICK API
-//--------------------------------------------------------------------+
-#define osal_millis tusb_hal_millis
-
-//--------------------------------------------------------------------+
// TASK API
// NOTES: Each blocking OSAL_NONE services such as semaphore wait,
// queue receive embedded return statement, therefore local variable
@@ -97,9 +92,9 @@ static inline osal_task_t osal_task_create(osal_func_t code, const char* name, u #define osal_task_delay(msec) \
do {\
- _timeout = osal_millis();\
+ _timeout = tusb_hal_millis();\
_state = __LINE__; case __LINE__:\
- if ( _timeout + msec > osal_millis() ) \
+ if ( _timeout + msec > tusb_hal_millis() ) \
return TUSB_ERROR_OSAL_WAITING;\
}while(0)
@@ -164,10 +159,10 @@ static inline void osal_queue_flush(osal_queue_t const queue_hdl) #define osal_queue_receive(queue_hdl, p_data, msec, p_error) \
do {\
- _timeout = osal_millis();\
+ _timeout = tusb_hal_millis();\
_state = __LINE__; case __LINE__:\
if( queue_hdl->count == 0 ) {\
- if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && ( _timeout + msec <= osal_millis()) ) /* time out */ \
+ if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && ( _timeout + msec <= tusb_hal_millis()) ) /* time out */ \
*(p_error) = TUSB_ERROR_OSAL_TIMEOUT;\
else\
return TUSB_ERROR_OSAL_WAITING;\
@@ -218,10 +213,10 @@ static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl) #define osal_semaphore_wait(sem_hdl, msec, p_error) \
do {\
- _timeout = osal_millis();\
+ _timeout = tusb_hal_millis();\
_state = __LINE__; case __LINE__:\
if( sem_hdl->count == 0 ) {\
- if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && (_timeout + msec <= osal_millis()) ) /* time out */ \
+ if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && (_timeout + msec <= tusb_hal_millis()) ) /* time out */ \
*(p_error) = TUSB_ERROR_OSAL_TIMEOUT;\
else\
return TUSB_ERROR_OSAL_WAITING;\
|