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

22
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)
@ -88,7 +89,7 @@ static void _xtimer_now_internal(uint32_t *short_term, uint32_t *long_term)
long_value = _long_cnt; long_value = _long_cnt;
after = _xtimer_now(); after = _xtimer_now();
} while(before > after); } while (before > after);
*short_term = after; *short_term = after;
*long_term = long_value; *long_term = long_value;
@ -97,9 +98,10 @@ 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;
} }
void _xtimer_set64(xtimer_t *timer, uint32_t offset, uint32_t long_offset) void _xtimer_set64(xtimer_t *timer, uint32_t offset, uint32_t long_offset)
@ -107,7 +109,7 @@ void _xtimer_set64(xtimer_t *timer, uint32_t offset, uint32_t long_offset)
DEBUG(" _xtimer_set64() offset=%" PRIu32 " long_offset=%" PRIu32 "\n", offset, long_offset); DEBUG(" _xtimer_set64() offset=%" PRIu32 " long_offset=%" PRIu32 "\n", offset, long_offset);
if (!long_offset) { if (!long_offset) {
/* timer fits into the short timer */ /* timer fits into the short timer */
_xtimer_set(timer, (uint32_t) offset); _xtimer_set(timer, (uint32_t)offset);
} }
else { else {
int state = irq_disable(); int state = irq_disable();
@ -197,7 +199,7 @@ int _xtimer_set_absolute(xtimer_t *timer, uint32_t target)
timer->long_target++; timer->long_target++;
} }
if ( (timer->long_target > _long_cnt) || !_this_high_period(target) ) { if ((timer->long_target > _long_cnt) || !_this_high_period(target)) {
DEBUG("xtimer_set_absolute(): the timer doesn't fit into the low-level timer's mask.\n"); DEBUG("xtimer_set_absolute(): the timer doesn't fit into the low-level timer's mask.\n");
_add_timer_to_long_list(&long_list_head, timer); _add_timer_to_long_list(&long_list_head, timer);
} }
@ -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
@ -338,7 +342,7 @@ static xtimer_t *_merge_lists(xtimer_t *head_a, xtimer_t *head_b)
xtimer_t *result_head = _compare(head_a, head_b); xtimer_t *result_head = _compare(head_a, head_b);
xtimer_t *pos = result_head; xtimer_t *pos = result_head;
while(1) { while (1) {
head_a = head_a->next; head_a = head_a->next;
head_b = head_b->next; head_b = head_b->next;
if (!head_a) { if (!head_a) {