diff options
| author | hathach <[email protected]> | 2018-03-22 16:25:24 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-22 16:25:24 +0700 |
| commit | 90ba1e67d95a0d558443868ac07428cff37b302e (patch) | |
| tree | 0b0eedbc10aae73761d024b4498c77d70394d43c /tinyusb/osal | |
| parent | 57a09b2fcefcf6aaa010665c775da9c426c6b299 (diff) | |
rename osal SUBSTASK to STASK
Diffstat (limited to 'tinyusb/osal')
| -rw-r--r-- | tinyusb/osal/osal.h | 12 | ||||
| -rw-r--r-- | tinyusb/osal/osal_none.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h index e4827bf37..83f2573a8 100644 --- a/tinyusb/osal/osal.h +++ b/tinyusb/osal/osal.h @@ -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
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 9bf7367ec..80670a9ca 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -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
|