michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: counter: nrfx_rtc: Remove is_bit_mask() implementation

Browse source 
Replace is_bit_mask() with IS_BIT_MASK() and remove the implementation.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@fujitsu.com>
This commit is contained in:
TOKITA Hiroshi 2022-12-11 19:18:47 +09:00 • committed by Carles Cufí
commit 21dc3f58e4
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/counter/counter_nrfx_rtc.c
View file

@ -102,12 +102,6 @@ static int get_value(const struct device *dev, uint32_t *ticks)
return 0; return 0;
} }
/* Return true if value equals 2^n - 1 */
static inline bool is_bit_mask(uint32_t val)
{
return !(val & (val + 1));
}
/* Function calculates distance between to values assuming that one first /* Function calculates distance between to values assuming that one first
* argument is in front and that values wrap. * argument is in front and that values wrap.
*/ */
@ -116,7 +110,7 @@ static uint32_t ticks_sub(const struct device *dev, uint32_t val,
{ {
if (IS_FIXED_TOP(dev)) { if (IS_FIXED_TOP(dev)) {
return (val - old) & COUNTER_MAX_TOP_VALUE; return (val - old) & COUNTER_MAX_TOP_VALUE;
} else if (likely(is_bit_mask(top))) { } else if (likely(IS_BIT_MASK(top))) {
return (val - old) & top; return (val - old) & top;
} }
@ -146,7 +140,7 @@ static uint32_t ticks_add(const struct device *dev, uint32_t val1,
ARG_UNUSED(top); ARG_UNUSED(top);
return sum & COUNTER_MAX_TOP_VALUE; return sum & COUNTER_MAX_TOP_VALUE;
} }
if (likely(is_bit_mask(top))) { if (likely(IS_BIT_MASK(top))) {
sum = sum & top; sum = sum & top;
} else { } else {
sum = sum > top ? sum - (top + 1) : sum; sum = sum > top ? sum - (top + 1) : sum;