diff options
| author | Ha Thach <[email protected]> | 2020-04-07 12:12:44 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-07 12:12:44 +0700 |
| commit | bfc43bad81c3faf77ffb14b9043a5064d52a7f30 (patch) | |
| tree | 7b28ee550a5c5080d2f3ed4b1747a416dfc097c1 /src | |
| parent | 4430ea61e20844726cdce33602e60f40a136a99e (diff) | |
| parent | 06d7fdc22897f04d152b1746644ca9733e44fa54 (diff) | |
Merge pull request #321 from pigrew/tweak20200331
Misc. tweaks, and fix for USBTMC descriptors without an INT EP
Diffstat (limited to 'src')
| -rw-r--r-- | src/class/usbtmc/usbtmc_device.c | 2 | ||||
| -rw-r--r-- | src/class/usbtmc/usbtmc_device.h | 2 | ||||
| -rw-r--r-- | src/common/tusb_verify.h | 6 | ||||
| -rw-r--r-- | src/osal/osal.h | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/class/usbtmc/usbtmc_device.c b/src/class/usbtmc/usbtmc_device.c index 916422752..92d8d34ef 100644 --- a/src/class/usbtmc/usbtmc_device.c +++ b/src/class/usbtmc/usbtmc_device.c @@ -590,7 +590,7 @@ bool usbtmcd_control_request_cb(uint8_t rhport, tusb_control_request_t const * r criticalEnter(); usbtmc_state.state = STATE_NAK; // USBD core has placed EP in NAK state for us criticalLeave(); - tud_usmtmc_bulkOut_clearFeature_cb(); + tud_usbtmc_bulkOut_clearFeature_cb(); } else if (ep_addr == usbtmc_state.ep_bulk_in) { diff --git a/src/class/usbtmc/usbtmc_device.h b/src/class/usbtmc/usbtmc_device.h index 4c52989c2..e231dd72d 100644 --- a/src/class/usbtmc/usbtmc_device.h +++ b/src/class/usbtmc/usbtmc_device.h @@ -69,7 +69,7 @@ void tud_usbtmc_open_cb(uint8_t interface_id); bool tud_usbtmc_msgBulkOut_start_cb(usbtmc_msg_request_dev_dep_out const * msgHeader); // transfer_complete does not imply that a message is complete. bool tud_usbtmc_msg_data_cb( void *data, size_t len, bool transfer_complete); -void tud_usmtmc_bulkOut_clearFeature_cb(void); // Notice to clear and abort the pending BULK out transfer +void tud_usbtmc_bulkOut_clearFeature_cb(void); // Notice to clear and abort the pending BULK out transfer bool tud_usbtmc_msgBulkIn_request_cb(usbtmc_msg_request_dev_dep_in const * request); bool tud_usbtmc_msgBulkIn_complete_cb(void); diff --git a/src/common/tusb_verify.h b/src/common/tusb_verify.h index 74150d6c5..fee291df6 100644 --- a/src/common/tusb_verify.h +++ b/src/common/tusb_verify.h @@ -79,8 +79,8 @@ #define _MESS_ERR(_err) printf("%s %d: failed, error = %s\r\n", __func__, __LINE__, tusb_strerr[_err]) #define _MESS_FAILED() printf("%s %d: assert failed\r\n", __func__, __LINE__) #else - #define _MESS_ERR(_err) - #define _MESS_FAILED() + #define _MESS_ERR(_err) do {} while (0) + #define _MESS_FAILED() do {} while (0) #endif // Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7 @@ -94,7 +94,7 @@ #if defined(__riscv) #define TU_BREAKPOINT() do { __asm("ebreak\n"); } while(0) #else - #define TU_BREAKPOINT() + #define TU_BREAKPOINT() do {} while (0) #endif #endif diff --git a/src/osal/osal.h b/src/osal/osal.h index 94c71e7d9..0421b3294 100644 --- a/src/osal/osal.h +++ b/src/osal/osal.h @@ -36,12 +36,12 @@ #include "common/tusb_common.h" -enum -{ - OSAL_TIMEOUT_NOTIMEOUT = 0, // return immediately - OSAL_TIMEOUT_NORMAL = 10, // default timeout - OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFFUL -}; +// Return immediately +#define OSAL_TIMEOUT_NOTIMEOUT (0) +// Default timeout +#define OSAL_TIMEOUT_NORMAL (10) +// Wait forever +#define OSAL_TIMEOUT_WAIT_FOREVER (UINT32_MAX) #define OSAL_TIMEOUT_CONTROL_XFER OSAL_TIMEOUT_WAIT_FOREVER |