Merge pull request #6411 from OlegHahm/xtimer_debug_formatter

xtimer: fix formatter for xtimer_now in DEBUG
RIOT-OS · Jan 18, 2017 · eaffe05 · eaffe05
2 parents 9666f58 + 24c205d
commit eaffe05
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/sys/xtimer/xtimer_core.c b/sys/xtimer/xtimer_core.c
@@ -128,7 +128,8 @@ void _xtimer_set64(xtimer_t *timer, uint32_t offset, uint32_t long_offset)
 
 void _xtimer_set(xtimer_t *timer, uint32_t offset)
 {
-    DEBUG("timer_set(): offset=%" PRIu32 " now=%" PRIu32 " (%" PRIu32 ")\n", offset, xtimer_now(), _xtimer_lltimer_now());
+    DEBUG("timer_set(): offset=%" PRIu32 " now=%" PRIu32 " (%" PRIu32 ")\n",
+          offset, xtimer_now(), _xtimer_lltimer_now().ticks32);
     if (!timer->callback) {
         DEBUG("timer_set(): timer has no callback.\n");
         return;
@@ -434,8 +435,9 @@ static void _timer_callback(void)
 
     _in_handler = 1;
 
-    DEBUG("_timer_callback() now=%" PRIu32 " (%" PRIu32 ")pleft=%" PRIu32 "\n", xtimer_now(),
-            _xtimer_lltimer_mask(xtimer_now()), _xtimer_lltimer_mask(0xffffffff - xtimer_now()));
+    DEBUG("_timer_callback() now=%" PRIu32 " (%" PRIu32 ")pleft=%" PRIu32 "\n",
+          xtimer_now().ticks32, _xtimer_lltimer_mask(xtimer_now()),
+          _xtimer_lltimer_mask(0xffffffff - xtimer_now()));
 
     if (!timer_list_head) {
         DEBUG("_timer_callback(): tick\n");