diff options
| author | Reinhard Panhuber <[email protected]> | 2020-09-04 16:23:39 +0200 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2020-09-04 16:23:39 +0200 |
| commit | 12562fc966e2c653de3f856afd7384063641dd80 (patch) | |
| tree | d48b7bb3cb273cfbd1db04f75346dd107b4ec336 /src/osal | |
| parent | 338e96fa826b2e2bbb6fb489456202e9e4ec4fe2 (diff) | |
| parent | 10d5dac9137adfd6c14d96e1079f08447eacd9d8 (diff) | |
Merge remote-tracking branch 'upstream/master' into uac2
Diffstat (limited to 'src/osal')
| -rw-r--r-- | src/osal/osal.h | 6 | ||||
| -rw-r--r-- | src/osal/osal_none.h | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/osal/osal.h b/src/osal/osal.h index 2e7a3539f..b5057ff4c 100644 --- a/src/osal/osal.h +++ b/src/osal/osal.h @@ -37,9 +37,9 @@ #include "common/tusb_common.h" // Return immediately -#define OSAL_TIMEOUT_NOTIMEOUT (0) +#define OSAL_TIMEOUT_NOTIMEOUT (0) // Default timeout -#define OSAL_TIMEOUT_NORMAL (10) +#define OSAL_TIMEOUT_NORMAL (10) // Wait forever #define OSAL_TIMEOUT_WAIT_FOREVER (UINT32_MAX) @@ -62,7 +62,7 @@ typedef void (*osal_task_func_t)( void * ); //--------------------------------------------------------------------+ // OSAL Porting API //--------------------------------------------------------------------+ -static inline void osal_task_delay(uint32_t msec); +//static inline void osal_task_delay(uint32_t msec); //------------- Semaphore -------------// static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef); diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h index 0ac5e8aac..4a5843f8e 100644 --- a/src/osal/osal_none.h +++ b/src/osal/osal_none.h @@ -34,14 +34,14 @@ //--------------------------------------------------------------------+ // TASK API //--------------------------------------------------------------------+ -static inline void osal_task_delay(uint32_t msec) -{ - (void) msec; - // TODO only used by Host stack, will implement using SOF - -// uint32_t start = tusb_hal_millis(); -// while ( ( tusb_hal_millis() - start ) < msec ) {} -} +//static inline void osal_task_delay(uint32_t msec) +//{ +// (void) msec; +// // TODO only used by Host stack, will implement using SOF +// +//// uint32_t start = tusb_hal_millis(); +//// while ( ( tusb_hal_millis() - start ) < msec ) {} +//} //--------------------------------------------------------------------+ // Binary Semaphore API |