diff options
| author | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
|---|---|---|
| committer | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
| commit | cb0f1d98db3c4bcfdcba231a78b1c18805483ad8 (patch) | |
| tree | fa88fc9cb41a59a2089ea2e43d8feac2b8987474 /src/common | |
| parent | 970da35fb303f1aa44e6279b14b80418f3250f60 (diff) | |
| parent | 6e939de9d673979721b83b0b3ab724ebd652770c (diff) | |
Merge remote-tracking branch 'origin/master' into CCRX_Port
# Conflicts:
# src/portable/renesas/usba/dcd_usba.c
# src/tusb_option.h
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tusb_common.h | 6 | ||||
| -rw-r--r-- | src/common/tusb_verify.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h index 889ad7b25..8490daad7 100644 --- a/src/common/tusb_common.h +++ b/src/common/tusb_common.h @@ -123,7 +123,7 @@ TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_align4k (uint32_t value) { retur TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_offset4k(uint32_t value) { return (value & 0xFFFUL); } //------------- Mathematics -------------// -TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_abs(int32_t value) { return (uint32_t)((value < 0) ? (-value) : value); } +TU_ATTR_ALWAYS_INLINE static inline uint32_t tu_div_ceil(uint32_t v, uint32_t d) { return (v + d -1)/d; } /// inclusive range checking TODO remove TU_ATTR_ALWAYS_INLINE static inline bool tu_within(uint32_t lower, uint32_t value, uint32_t upper) @@ -317,8 +317,8 @@ void tu_print_var(uint8_t const* buf, uint32_t bufsize) #define TU_LOG1 tu_printf #define TU_LOG1_MEM tu_print_mem #define TU_LOG1_VAR(_x) tu_print_var((uint8_t const*)(_x), sizeof(*(_x))) -#define TU_LOG1_INT(_x) tu_printf(#_x " = %ld\n", (uint32_t) (_x) ) -#define TU_LOG1_HEX(_x) tu_printf(#_x " = %lX\n", (uint32_t) (_x) ) +#define TU_LOG1_INT(_x) tu_printf(#_x " = %ld\r\n", (uint32_t) (_x) ) +#define TU_LOG1_HEX(_x) tu_printf(#_x " = %lX\r\n", (uint32_t) (_x) ) // Log Level 2: Warn #if CFG_TUSB_DEBUG >= 2 diff --git a/src/common/tusb_verify.h b/src/common/tusb_verify.h index 542809899..56ba8bcd1 100644 --- a/src/common/tusb_verify.h +++ b/src/common/tusb_verify.h @@ -75,7 +75,7 @@ #if CFG_TUSB_DEBUG #include <stdio.h> #define _MESS_ERR(_err) tu_printf("%s %d: failed, error = %s\r\n", __func__, __LINE__, tusb_strerr[_err]) - #define _MESS_FAILED() tu_printf("%s %d: assert failed\r\n", __func__, __LINE__) + #define _MESS_FAILED() tu_printf("%s %d: ASSERT FAILED\r\n", __func__, __LINE__) #else #define _MESS_ERR(_err) do {} while (0) #define _MESS_FAILED() do {} while (0) |