From 89d5ecebf4011fbbd7206ecd9df3b517d44347bc Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 29 Mar 2018 13:31:56 +0700 Subject: [PATCH] rename VERIFY_STATUS to VERIFY_ERR --- tinyusb/common/verify.h | 30 +++++++++---------- tinyusb/osal/osal.h | 4 +-- tinyusb/osal/osal_none.h | 4 +-- tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tinyusb/common/verify.h b/tinyusb/common/verify.h index 25ab3e1bf..44296d329 100644 --- a/tinyusb/common/verify.h +++ b/tinyusb/common/verify.h @@ -95,14 +95,14 @@ static inline void verify_breakpoint(void) /*------------- Generator for VERIFY and VERIFY_HDLR -------------*/ #define VERIFY_DEFINE(_cond, _handler, _error) do { if ( !(_cond) ) { _handler; return _error; } } while(0) -/*------------- Generator for VERIFY_STATUS and VERIFY_STATUS_HDLR -------------*/ -#define VERIFY_STS_DEF2(sts, _handler) \ +/*------------- Generator for VERIFY_ERR and VERIFY_ERR_HDLR -------------*/ +#define VERIFY_ERR_DEF2(sts, _handler) \ do { \ uint32_t _status = (uint32_t)(sts); \ if ( 0 != _status ) { _VERIFY_MESS(_status); _handler; return _status; }\ } while(0) -#define VERIFY_STS_DEF3(sts, _handler, _error) \ +#define VERIFY_ERR_DEF3(sts, _handler, _error) \ do { \ uint32_t _status = (uint32_t)(sts); \ if ( 0 != _status ) { _VERIFY_MESS(_status); _handler; return _error; }\ @@ -135,23 +135,23 @@ static inline void verify_breakpoint(void) /*------------------------------------------------------------------*/ /* VERIFY STATUS - * - VERIFY_STS_1ARGS : return status of condition if failed - * - VERIFY_STS_2ARGS : return provided status code if failed + * - VERIFY_ERR_1ARGS : return status of condition if failed + * - VERIFY_ERR_2ARGS : return provided status code if failed *------------------------------------------------------------------*/ -#define VERIFY_STS_1ARGS(sts) VERIFY_STS_DEF2(sts, ) -#define VERIFY_STS_2ARGS(sts, _error) VERIFY_STS_DEF3(sts, ,_error) +#define VERIFY_ERR_1ARGS(sts) VERIFY_ERR_DEF2(sts, ) +#define VERIFY_ERR_2ARGS(sts, _error) VERIFY_ERR_DEF3(sts, ,_error) -#define VERIFY_STATUS(...) GET_3RD_ARG(__VA_ARGS__, VERIFY_STS_2ARGS, VERIFY_STS_1ARGS)(__VA_ARGS__) +#define VERIFY_ERR(...) GET_3RD_ARG(__VA_ARGS__, VERIFY_ERR_2ARGS, VERIFY_ERR_1ARGS)(__VA_ARGS__) /*------------------------------------------------------------------*/ /* VERIFY STATUS WITH HANDLER - * - VERIFY_STS_HDLR_2ARGS : execute handler, return status if failed - * - VERIFY_STS_HDLR_3ARGS : execute handler, return provided error if failed + * - VERIFY_ERR_HDLR_2ARGS : execute handler, return status if failed + * - VERIFY_ERR_HDLR_3ARGS : execute handler, return provided error if failed *------------------------------------------------------------------*/ -#define VERIFY_STS_HDLR_2ARGS(sts, _handler) VERIFY_STS_DEF2(sts, _handler) -#define VERIFY_STS_HDLR_3ARGS(sts, _handler, _error) VERIFY_STS_DEF3(sts, _handler, _error) +#define VERIFY_ERR_HDLR_2ARGS(sts, _handler) VERIFY_ERR_DEF2(sts, _handler) +#define VERIFY_ERR_HDLR_3ARGS(sts, _handler, _error) VERIFY_ERR_DEF3(sts, _handler, _error) -#define VERIFY_STATUS_HDLR(...) GET_4TH_ARG(__VA_ARGS__, VERIFY_STS_HDLR_3ARGS, VERIFY_STS_HDLR_2ARGS)(__VA_ARGS__) +#define VERIFY_ERR_HDLR(...) GET_4TH_ARG(__VA_ARGS__, VERIFY_ERR_HDLR_3ARGS, VERIFY_ERR_HDLR_2ARGS)(__VA_ARGS__) @@ -170,8 +170,8 @@ static inline void verify_breakpoint(void) /* ASSERT Error * basically VERIFY Error with verify_breakpoint() as handler *------------------------------------------------------------------*/ -#define ASERT_ERR_1ARGS(_err) VERIFY_STS_DEF2(_err, verify_breakpoint()) -#define ASERT_ERR_2ARGS(_err, _ret) VERIFY_STS_DEF3(_err, verify_breakpoint(), _ret) +#define ASERT_ERR_1ARGS(_err) VERIFY_ERR_DEF2(_err, verify_breakpoint()) +#define ASERT_ERR_2ARGS(_err, _ret) VERIFY_ERR_DEF3(_err, verify_breakpoint(), _ret) #define ASSERT_ERR(...) GET_3RD_ARG(__VA_ARGS__, ASERT_ERR_2ARGS, ASERT_ERR_1ARGS)(__VA_ARGS__) diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h index e74929de7..f072ceae8 100644 --- a/tinyusb/osal/osal.h +++ b/tinyusb/osal/osal.h @@ -78,8 +78,8 @@ #define STASK_INVOKE(_subtask, _status) (_status) = _subtask //------------- Sub Task Assert -------------// - #define STASK_ASSERT_ERR(_err) VERIFY_STATUS(_err) - #define STASK_ASSERT_ERR_HDLR(_err, _func) VERIFY_STATUS_HDLR(_err, _func) + #define STASK_ASSERT_ERR(_err) VERIFY_ERR(_err) + #define STASK_ASSERT_ERR_HDLR(_err, _func) VERIFY_ERR_HDLR(_err, _func) #define STASK_ASSERT(_cond) VERIFY(_cond, TUSB_ERROR_OSAL_TASK_FAILED) #define STASK_ASSERT_HDLR(_cond, _func) VERIFY_HDLR(_cond, _func) diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 414352df1..f150d5c34 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -125,8 +125,8 @@ static inline osal_task_t osal_task_create(osal_func_t code, const char* name, u //------------- Sub Task Assert -------------// #define STASK_RETURN(error) do { TASK_RESTART; return error; } while(0) -#define STASK_ASSERT_ERR(_err) VERIFY_STATUS_HDLR(_err, TASK_RESTART) -#define STASK_ASSERT_ERR_HDLR(_err, _func) VERIFY_STATUS_HDLR(_err, _func; TASK_RESTART ) +#define STASK_ASSERT_ERR(_err) VERIFY_ERR_HDLR(_err, TASK_RESTART) +#define STASK_ASSERT_ERR_HDLR(_err, _func) VERIFY_ERR_HDLR(_err, _func; TASK_RESTART ) #define STASK_ASSERT(_cond) VERIFY_HDLR(_cond, TASK_RESTART) #define STASK_ASSERT_HDLR(_cond, _func) VERIFY_HDLR(_cond, _func; TASK_RESTART) diff --git a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c index aee001c50..619aa6b21 100644 --- a/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c +++ b/tinyusb/portable/nxp/lpc17xx/dcd_lpc175x_6x.c @@ -399,13 +399,13 @@ bool dcd_control_xfer(uint8_t rhport, tusb_dir_t dir, uint8_t * p_buffer, uint16 dcd_data.control_dma.remaining_bytes = length; // lpc17xx already received the first DATA OUT packet by now - VERIFY_STATUS ( pipe_control_xfer(ep_data, p_buffer, length), false ); + VERIFY_ERR ( pipe_control_xfer(ep_data, p_buffer, length), false ); } //------------- Status Phase (opposite direct to Data) -------------// if (dir == TUSB_DIR_OUT) { // only write for CONTROL OUT, CONTROL IN data will be retrieved in hal_dcd_isr // TODO ???? - VERIFY_STATUS ( pipe_control_write(NULL, 0), false ); + VERIFY_ERR ( pipe_control_write(NULL, 0), false ); } return true;