diff options
| author | hathach <[email protected]> | 2013-04-24 12:20:56 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-04-24 12:20:56 +0700 |
| commit | d312be700636258060765b63a5ea4f73aaa5500a (patch) | |
| tree | 002a7c9daf2589ab36c7a10e0dca00749fd3c712 /tinyusb/osal/osal_none.h | |
| parent | 73d5f00a40dcdc9a84e0f915d0ff349f231444c6 (diff) | |
fix potential error with usbh_control_xfer_subtask in subtask_assert
change back to use task_assert style in usbh_enumeraion
change test to task->subtask->subtask style in test/test_osal_none.c
Diffstat (limited to 'tinyusb/osal/osal_none.h')
| -rw-r--r-- | tinyusb/osal/osal_none.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 9b8b16fc5..2aaa9b784 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -122,35 +122,29 @@ static inline volatile uint32_t osal_tick_get(void) }\ }while(0) -#define OSAL_SUBTASK_BEGIN OSAL_TASK_LOOP_BEGIN -#define OSAL_SUBTASK_END OSAL_TASK_LOOP_END +#define OSAL_SUBTASK_BEGIN OSAL_TASK_LOOP_BEGIN +#define OSAL_SUBTASK_END OSAL_TASK_LOOP_END //------------- Task Assert -------------// #define _TASK_ASSERT_ERROR_HANDLER(error, func_call) \ func_call; TASK_RESTART; return error -#define TASK_ASSERT_STATUS(sts) \ +#define SUBTASK_ASSERT_STATUS(sts) \ ASSERT_DEFINE_WITH_HANDLER(_TASK_ASSERT_ERROR_HANDLER, , tusb_error_t status = (tusb_error_t)(sts),\ TUSB_ERROR_NONE == status, status, "%s", TUSB_ErrorStr[status]) -#define TASK_ASSERT_STATUS_WITH_HANDLER(sts, func_call) \ +#define SUBTASK_ASSERT_STATUS_WITH_HANDLER(sts, func_call) \ ASSERT_DEFINE_WITH_HANDLER(_TASK_ASSERT_ERROR_HANDLER, func_call, tusb_error_t status = (tusb_error_t)(sts),\ TUSB_ERROR_NONE == status, status, "%s", TUSB_ErrorStr[status]) -#define TASK_ASSERT(condition) \ +#define SUBTASK_ASSERT(condition) \ ASSERT_DEFINE_WITH_HANDLER(_TASK_ASSERT_ERROR_HANDLER, , , \ (condition), TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false") -#define TASK_ASSERT_WITH_HANDLER(condition, func_call) \ +#define SUBTASK_ASSERT_WITH_HANDLER(condition, func_call) \ ASSERT_DEFINE_WITH_HANDLER(_TASK_ASSERT_ERROR_HANDLER, func_call, ,\ condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false") -//------------- 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 //--------------------------------------------------------------------+ |