diff options
| author | hathach <[email protected]> | 2013-04-25 11:00:56 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-04-25 11:00:56 +0700 |
| commit | e9dbce5f1bfe193884293e7fb555f963c7f2e649 (patch) | |
| tree | c4d49b49edafcdb42cb67c24ed7aa7c51d393f34 /tinyusb/osal | |
| parent | d4a2600ecc8cdeec26485f8ab564b12de41d6b9b (diff) | |
add TUSB_CFG_OS_TASK_PRIO to mandatory option for using an RTOS
using plain char for error enum character
increase freeRTOS configMAX_PRIORITIES to 16
house keeping & clean up compiler warning
Diffstat (limited to 'tinyusb/osal')
| -rw-r--r-- | tinyusb/osal/osal_common.h | 6 | ||||
| -rw-r--r-- | tinyusb/osal/osal_freeRTOS.h | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tinyusb/osal/osal_common.h b/tinyusb/osal/osal_common.h index eda859145..6a9965fea 100644 --- a/tinyusb/osal/osal_common.h +++ b/tinyusb/osal/osal_common.h @@ -64,12 +64,6 @@ enum OSAL_TIMEOUT_WAIT_FOREVER = 0x0EEEEEEE }; -typedef enum { - OSAL_PRIO_LOW, - OSAL_PRIO_NORMAL, - OSAL_PRIO_HIGH -}osal_prio_t; - static inline uint32_t osal_tick_from_msec(uint32_t msec) ATTR_CONST ATTR_ALWAYS_INLINE; static inline uint32_t osal_tick_from_msec(uint32_t msec) { diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h index d92cb374c..cd92812cb 100644 --- a/tinyusb/osal/osal_freeRTOS.h +++ b/tinyusb/osal/osal_freeRTOS.h @@ -75,7 +75,7 @@ extern "C" { void task_func typedef struct { - signed portCHAR const * name; + char const * name; pdTASK_CODE code; unsigned portSHORT stack_depth; unsigned portBASE_TYPE prio; @@ -92,7 +92,7 @@ typedef struct { static inline tusb_error_t osal_task_create(osal_task_t *task) ATTR_ALWAYS_INLINE; static inline tusb_error_t osal_task_create(osal_task_t *task) { - return pdPASS == xTaskCreate(task->code, task->name, task->stack_depth, NULL, task->prio, NULL) ? + return pdPASS == xTaskCreate(task->code, (signed portCHAR const *) task->name, task->stack_depth, NULL, task->prio, NULL) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TASK_CREATE_FAILED; } @@ -104,7 +104,8 @@ static inline tusb_error_t osal_task_create(osal_task_t *task) //------------- Sub Task -------------// #define OSAL_SUBTASK_BEGIN // TODO refractor move -#define OSAL_SUBTASK_END +#define OSAL_SUBTASK_END \ + return TUSB_ERROR_NONE; #define OSAL_SUBTASK_INVOKED_AND_WAIT(subtask, status) \ status = subtask |