riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xtimer_core: uncrustify

Browse Source
This commit is contained in:
josar 2018-09-18 15:41:34 +02:00
parent b518f3c73e
commit f770d17e12
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/xtimer/xtimer_core.c
View File

@ -61,12 +61,13 @@ static inline int _is_set(xtimer_t *timer)
return (timer->target || timer->long_target); return (timer->target || timer->long_target);
} }
static inline void xtimer_spin_until(uint32_t target) { static inline void xtimer_spin_until(uint32_t target)
{
#if XTIMER_MASK #if XTIMER_MASK
target = _xtimer_lltimer_mask(target); target = _xtimer_lltimer_mask(target);
#endif #endif
while (_xtimer_lltimer_now() > target); while (_xtimer_lltimer_now() > target) {}
while (_xtimer_lltimer_now() < target); while (_xtimer_lltimer_now() < target) {}
} }
void xtimer_init(void) void xtimer_init(void)
@ -97,6 +98,7 @@ static void _xtimer_now_internal(uint32_t *short_term, uint32_t *long_term)
uint64_t _xtimer_now64(void) uint64_t _xtimer_now64(void)
{ {
uint32_t short_term, long_term; uint32_t short_term, long_term;
_xtimer_now_internal(&short_term, &long_term); _xtimer_now_internal(&short_term, &long_term);
return ((uint64_t)long_term << 32) + short_term; return ((uint64_t)long_term << 32) + short_term;
@ -283,6 +285,7 @@ static void _remove(xtimer_t *timer)
void xtimer_remove(xtimer_t *timer) void xtimer_remove(xtimer_t *timer)
{ {
int state = irq_disable(); int state = irq_disable();
if (_is_set(timer)) { if (_is_set(timer)) {
_remove(timer); _remove(timer);
} }
@ -305,7 +308,8 @@ static uint32_t _time_left(uint32_t target, uint32_t reference)
} }
} }
static inline int _this_high_period(uint32_t target) { static inline int _this_high_period(uint32_t target)
{
#if XTIMER_MASK #if XTIMER_MASK
return (target & XTIMER_MASK) == _xtimer_high_cnt; return (target & XTIMER_MASK) == _xtimer_high_cnt;
#else #else