summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Conrad <[email protected]>2019-09-09 13:35:41 -0400
committerNathan Conrad <[email protected]>2019-09-09 13:35:41 -0400
commit75a3f791e30554cce09a941622bf16d2b9d60c24 (patch)
treeb19cef8a46f04f16309d172cad0d042ba03cbe0f /src
parent4517d504b875022ecbf7b18447e26be7af5f4aa7 (diff)
Remove some type conversion warnings (using GCC pedantic warnings)
Diffstat (limited to 'src')
-rw-r--r--src/common/tusb_common.h2
-rw-r--r--src/common/tusb_types.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h
index 4352505eb..c62a04128 100644
--- a/src/common/tusb_common.h
+++ b/src/common/tusb_common.h
@@ -117,7 +117,7 @@ static inline uint32_t tu_align4k (uint32_t value) { return (value & 0xFFFFF000U
static inline uint32_t tu_offset4k(uint32_t value) { return (value & 0xFFFUL); }
//------------- Mathematics -------------//
-static inline uint32_t tu_abs(int32_t value) { return (value < 0) ? (-value) : value; }
+static inline uint32_t tu_abs(int32_t value) { return (uint32_t)((value < 0) ? (-value) : value); }
/// inclusive range checking
static inline bool tu_within(uint32_t lower, uint32_t value, uint32_t upper)
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index 9aea2d772..a50e89934 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -442,12 +442,12 @@ static inline tusb_dir_t tu_edpt_dir(uint8_t addr)
// Get Endpoint number from address
static inline uint8_t tu_edpt_number(uint8_t addr)
{
- return addr & (~TUSB_DIR_IN_MASK);
+ return (uint8_t)(addr & (~TUSB_DIR_IN_MASK));
}
static inline uint8_t tu_edpt_addr(uint8_t num, uint8_t dir)
{
- return num | (dir ? TUSB_DIR_IN_MASK : 0);
+ return (uint8_t)(num | (dir ? TUSB_DIR_IN_MASK : 0));
}
//--------------------------------------------------------------------+