diff options
Diffstat (limited to 'tinyusb/osal')
| -rw-r--r-- | tinyusb/osal/osal.h | 2 | ||||
| -rw-r--r-- | tinyusb/osal/osal_freeRTOS.h | 19 | ||||
| -rw-r--r-- | tinyusb/osal/osal_none.h | 16 |
3 files changed, 19 insertions, 18 deletions
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h index 531911a7c..91ad3be45 100644 --- a/tinyusb/osal/osal.h +++ b/tinyusb/osal/osal.h @@ -89,7 +89,7 @@ tusb_error_t osal_task_create(osal_task_t *task); #define OSAL_TASK_DEF(name, code, stack_depth, prio) \ osal_task_t name -#define OSAL_TASK_DECLARE(task_name) \ +#define OSAL_TASK_FUNCTION(task_name) \ void task_name(void) #define OSAL_TASK_LOOP_BEGIN diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h index 19754410c..53986ad97 100644 --- a/tinyusb/osal/osal_freeRTOS.h +++ b/tinyusb/osal/osal_freeRTOS.h @@ -71,9 +71,6 @@ extern "C" { //--------------------------------------------------------------------+ // TASK API //--------------------------------------------------------------------+ -#define OSAL_TASK_DECLARE(task_name) \ - void task_name(void *p_task_para) - typedef struct { signed portCHAR const * name; pdTASK_CODE code; @@ -89,6 +86,10 @@ typedef struct { .prio = task_prio \ }; +#define OSAL_TASK_FUNCTION(task_name) \ + void task_name(void *p_task_para) + + #define OSAL_TASK_LOOP_BEGIN \ while(1) { @@ -96,7 +97,7 @@ typedef struct { } //------------- Sub Task -------------// -#define OSAL_SUBTASK_BEGIN +#define OSAL_SUBTASK_BEGIN // TODO refractor move #define OSAL_SUBTASK_END //------------- Task Assert -------------// @@ -114,11 +115,11 @@ typedef struct { condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false") -//------------- Sub Task Assert -------------// TODO replace directly by TASK ASSERT -#define SUBTASK_ASSERT_STATUS(...) TASK_ASSERT_STATUS(__VA_ARGS__) -#define SUBTASK_ASSERT_STATUS_WITH_HANDLER(...) TASK_ASSERT_STATUS_WITH_HANDLER(__VA_ARGS__) -#define SUBTASK_ASSERT(...) TASK_ASSERT(__VA_ARGS__) -#define SUBTASK_ASSERT_WITH_HANDLER(...) TASK_ASSERT_WITH_HANDLER(__VA_ARGS__) +//------------- Sub Task Assert -------------// +#define SUBTASK_ASSERT_STATUS TASK_ASSERT_STATUS +#define SUBTASK_ASSERT_STATUS_WITH_HANDLER TASK_ASSERT_STATUS_WITH_HANDLER +#define SUBTASK_ASSERT TASK_ASSERT +#define SUBTASK_ASSERT_WITH_HANDLER TASK_ASSERT_WITH_HANDLER //--------------------------------------------------------------------+ // Semaphore API diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 75bb41fbd..9b8b16fc5 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -51,12 +51,12 @@ #ifndef _TUSB_OSAL_NONE_H_ #define _TUSB_OSAL_NONE_H_ +#include "osal_common.h" + #ifdef __cplusplus extern "C" { #endif -#include "osal_common.h" - //--------------------------------------------------------------------+ // TICK API //--------------------------------------------------------------------+ @@ -90,7 +90,7 @@ static inline volatile uint32_t osal_tick_get(void) #define OSAL_TASK_DEF(name, code, stack_depth, prio) #define osal_task_create(x) TUSB_ERROR_NONE -#define OSAL_TASK_DECLARE(task_name) \ +#define OSAL_TASK_FUNCTION(task_name) \ tusb_error_t task_name(void) #define TASK_RESTART state = 0 @@ -145,11 +145,11 @@ static inline volatile uint32_t osal_tick_get(void) ASSERT_DEFINE_WITH_HANDLER(_TASK_ASSERT_ERROR_HANDLER, func_call, ,\ condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false") -//------------- Sub Task Assert -------------// TODO replace directly by TASK ASSERT -#define SUBTASK_ASSERT_STATUS(...) TASK_ASSERT_STATUS(__VA_ARGS__) -#define SUBTASK_ASSERT_STATUS_WITH_HANDLER(...) TASK_ASSERT_STATUS_WITH_HANDLER(__VA_ARGS__) -#define SUBTASK_ASSERT(...) TASK_ASSERT(__VA_ARGS__) -#define SUBTASK_ASSERT_WITH_HANDLER(...) TASK_ASSERT_WITH_HANDLER(__VA_ARGS__) +//------------- Sub Task Assert -------------// +#define SUBTASK_ASSERT_STATUS TASK_ASSERT_STATUS +#define SUBTASK_ASSERT_STATUS_WITH_HANDLER TASK_ASSERT_STATUS_WITH_HANDLER +#define SUBTASK_ASSERT TASK_ASSERT +#define SUBTASK_ASSERT_WITH_HANDLER TASK_ASSERT_WITH_HANDLER //--------------------------------------------------------------------+ // Semaphore API |