diff options
| author | hathach <[email protected]> | 2018-08-30 15:21:15 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-08-30 15:21:15 +0700 |
| commit | 4ef01d721ad6b49775f067d89faa5545d918f32f (patch) | |
| tree | 9146288783d363caec34eb064176a879674015a9 /src/osal | |
| parent | 61e4a8c3d34994f47ae7380217af4dbefef4aab9 (diff) | |
clean up osal task and subtask
Diffstat (limited to 'src/osal')
| -rw-r--r-- | src/osal/osal.h | 4 | ||||
| -rw-r--r-- | src/osal/osal_none.h | 25 |
2 files changed, 12 insertions, 17 deletions
diff --git a/src/osal/osal.h b/src/osal/osal.h index 3e0d9d5f1..16dc8da27 100644 --- a/src/osal/osal.h +++ b/src/osal/osal.h @@ -61,8 +61,10 @@ enum typedef void (*osal_task_func_t)( void * );
#if CFG_TUSB_OS == OPT_OS_NONE
- #include "osal_none.h"
+ #define OSAL_TASK_BEGIN
+ #define OSAL_TASK_END
+ #include "osal_none.h"
#else
#if CFG_TUSB_OS == OPT_OS_FREERTOS
#include "osal_freeRTOS.h"
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h index 3531686b4..012de9c78 100644 --- a/src/osal/osal_none.h +++ b/src/osal/osal_none.h @@ -79,18 +79,6 @@ static inline osal_task_t osal_task_create(osal_task_def_t* taskdef) #define TASK_RESTART \
_state = 0
-#define OSAL_TASK_BEGIN \
- static uint16_t _state = 0; \
- ATTR_UNUSED static uint32_t _timeout = 0; \
- (void) _timeout; \
- switch(_state) { \
- case 0: {
-
-#define OSAL_TASK_END \
- default: TASK_RESTART; break; \
- }} \
- return;
-
#define osal_task_delay(msec) \
do { \
_timeout = tusb_hal_millis(); \
@@ -102,11 +90,16 @@ static inline osal_task_t osal_task_create(osal_task_def_t* taskdef) //--------------------------------------------------------------------+
// SUBTASK (a sub function that uses OS blocking services & called by a task
//--------------------------------------------------------------------+
-#define OSAL_SUBTASK_BEGIN OSAL_TASK_BEGIN
+#define OSAL_SUBTASK_BEGIN \
+ static uint16_t _state = 0; \
+ ATTR_UNUSED static uint32_t _timeout = 0; \
+ (void) _timeout; \
+ switch(_state) { \
+ case 0: {
-#define OSAL_SUBTASK_END \
- default: TASK_RESTART; break; \
- }} \
+#define OSAL_SUBTASK_END \
+ default: TASK_RESTART; break; \
+ }} \
return TUSB_ERROR_NONE;
#define STASK_INVOKE(_subtask, _status) \
|