andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename osal SUBSTASK to STASK

Browse Source
This commit is contained in:
hathach
2018-03-22 16:25:24 +07:00
parent 57a09b2fce
commit 90ba1e67d9
11 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tinyusb/osal/osal.h
View File

@@ -74,15 +74,15 @@
#define OSAL_SUBTASK_BEGIN
#define OSAL_SUBTASK_END return TUSB_ERROR_NONE;
#define SUBTASK_RETURN(_error) return _error;
#define SUBTASK_INVOKE(_subtask, _status) (_status) = _subtask
#define STASK_RETURN(_error) return _error;
#define STASK_INVOKE(_subtask, _status) (_status) = _subtask
//------------- Sub Task Assert -------------//
#define SUBTASK_ASSERT_STATUS(sts) VERIFY_STATUS(sts)
#define SUBTASK_ASSERT(condition) VERIFY(condition, TUSB_ERROR_OSAL_TASK_FAILED)
#define STASK_ASSERT_STATUS(sts) VERIFY_STATUS(sts)
#define STASK_ASSERT(condition) VERIFY(condition, TUSB_ERROR_OSAL_TASK_FAILED)
#define SUBTASK_ASSERT_STATUS_HDLR(sts, func_call) VERIFY_STATUS_HDLR(sts, func_call)
#define SUBTASK_ASSERT_HDLR(condition, func_call) VERIFY_HDLR(condition, func_call)
#define STASK_ASSERT_STATUS_HDLR(sts, func_call) VERIFY_STATUS_HDLR(sts, func_call)
#define STASK_ASSERT_HDLR(condition, func_call) VERIFY_HDLR(condition, func_call)
#endif
#ifdef __cplusplus

12
tinyusb/osal/osal_none.h
View File

@@ -113,7 +113,7 @@ static inline osal_task_t osal_task_create(osal_func_t code, const char* name, u
}} \
return TUSB_ERROR_NONE;
#define SUBTASK_INVOKE(_subtask, _status) \
#define STASK_INVOKE(_subtask, _status) \
do { \
_state = __LINE__; case __LINE__: \
{ \
@@ -123,13 +123,13 @@ static inline osal_task_t osal_task_create(osal_func_t code, const char* name, u
}while(0)
//------------- Sub Task Assert -------------//
#define SUBTASK_RETURN(error) do { TASK_RESTART; return error; } while(0)
#define STASK_RETURN(error) do { TASK_RESTART; return error; } while(0)
#define SUBTASK_ASSERT_STATUS(sts) VERIFY_STATUS_HDLR(sts, TASK_RESTART)
#define SUBTASK_ASSERT_STATUS_HDLR(sts, func_call) VERIFY_STATUS_HDLR(sts, func_call; TASK_RESTART )
#define STASK_ASSERT_STATUS(sts) VERIFY_STATUS_HDLR(sts, TASK_RESTART)
#define STASK_ASSERT_STATUS_HDLR(sts, func_call) VERIFY_STATUS_HDLR(sts, func_call; TASK_RESTART )
#define SUBTASK_ASSERT(condition) VERIFY_HDLR(condition, TASK_RESTART)
#define SUBTASK_ASSERT_HDLR(condition, func_call) VERIFY_HDLR(condition, func_call; TASK_RESTART)
#define STASK_ASSERT(condition) VERIFY_HDLR(condition, TASK_RESTART)
#define STASK_ASSERT_HDLR(condition, func_call) VERIFY_HDLR(condition, func_call; TASK_RESTART)
//--------------------------------------------------------------------+
// QUEUE API