From 4d862955c211866b20f79462bb937baae4623958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= Date: Tue, 5 Jul 2016 16:45:41 +0200 Subject: [PATCH] xtimer: Rename XTIMER -> XTIMER_DEV --- boards/airfy-beacon/include/board.h | 2 +- boards/cc2538dk/include/board.h | 2 +- boards/chronos/include/board.h | 2 +- boards/msb-430-common/include/board_common.h | 2 +- boards/nrf51dongle/include/board.h | 2 +- boards/nucleo-f401/include/board.h | 2 +- boards/nucleo-l1/include/board.h | 2 +- boards/openmote-cc2538/include/board.h | 2 +- boards/pca10000/include/board.h | 2 +- boards/pca10005/include/board.h | 2 +- boards/remote-common/include/board_common.h | 2 +- boards/samr21-xpro/include/board.h | 2 +- boards/stm32f4discovery/include/board.h | 2 +- boards/telosb/include/board.h | 2 +- boards/wsn430-common/include/board_common.h | 2 +- boards/yunjia-nrf51822/include/board.h | 2 +- boards/z1/include/board.h | 2 +- sys/include/xtimer.h | 4 ++-- sys/include/xtimer/implementation.h | 4 ++-- sys/xtimer/xtimer_core.c | 4 ++-- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h index 59db7e720..0f6aa8c57 100644 --- a/boards/airfy-beacon/include/board.h +++ b/boards/airfy-beacon/include/board.h @@ -31,7 +31,7 @@ * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (24) #define XTIMER_BACKOFF (40) diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h index ebb064876..e10c37123 100644 --- a/boards/cc2538dk/include/board.h +++ b/boards/cc2538dk/include/board.h @@ -76,7 +76,7 @@ extern "C" { * @name xtimer configuration * @{ */ -#define XTIMER TIMER_0 +#define XTIMER_DEV TIMER_0 #define XTIMER_CHAN (0) #define XTIMER_SHIFT (-4) #define XTIMER_BACKOFF (50) diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h index b4d4de2c0..25a5ee2ce 100644 --- a/boards/chronos/include/board.h +++ b/boards/chronos/include/board.h @@ -38,7 +38,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (16) /** @} */ diff --git a/boards/msb-430-common/include/board_common.h b/boards/msb-430-common/include/board_common.h index e87fd8eb3..0ad4a05ae 100644 --- a/boards/msb-430-common/include/board_common.h +++ b/boards/msb-430-common/include/board_common.h @@ -37,7 +37,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (16) #define XTIMER_BACKOFF (40) diff --git a/boards/nrf51dongle/include/board.h b/boards/nrf51dongle/include/board.h index c215c3697..71eaabc26 100644 --- a/boards/nrf51dongle/include/board.h +++ b/boards/nrf51dongle/include/board.h @@ -32,7 +32,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (24) #define XTIMER_BACKOFF (40) diff --git a/boards/nucleo-f401/include/board.h b/boards/nucleo-f401/include/board.h index 29b08224e..9df74ec0e 100644 --- a/boards/nucleo-f401/include/board.h +++ b/boards/nucleo-f401/include/board.h @@ -31,7 +31,7 @@ extern "C" { * @name xtimer configuration * @{ */ -#define XTIMER TIMER_0 +#define XTIMER_DEV TIMER_0 #define XTIMER_CHAN (0) #define XTIMER_OVERHEAD (6) #define XTIMER_BACKOFF (5) diff --git a/boards/nucleo-l1/include/board.h b/boards/nucleo-l1/include/board.h index 5ae9db75a..d956b8a2b 100644 --- a/boards/nucleo-l1/include/board.h +++ b/boards/nucleo-l1/include/board.h @@ -31,7 +31,7 @@ extern "C" { * @name xtimer configuration * @{ */ -#define XTIMER TIMER_DEV(0) +#define XTIMER_DEV TIMER_DEV(0) #define XTIMER_CHAN (0) #define XTIMER_OVERHEAD (6) #define XTIMER_BACKOFF (3) diff --git a/boards/openmote-cc2538/include/board.h b/boards/openmote-cc2538/include/board.h index 2336d4664..53f06cff3 100644 --- a/boards/openmote-cc2538/include/board.h +++ b/boards/openmote-cc2538/include/board.h @@ -64,7 +64,7 @@ * @name xtimer configuration * @{ */ -#define XTIMER TIMER_0 +#define XTIMER_DEV TIMER_0 #define XTIMER_CHAN (0) #define XTIMER_SHIFT (-4) #define XTIMER_BACKOFF (50) diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h index 490a8b491..d2a6349f2 100644 --- a/boards/pca10000/include/board.h +++ b/boards/pca10000/include/board.h @@ -32,7 +32,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (24) #define XTIMER_BACKOFF (40) diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h index a3d2c2b65..4805f5597 100644 --- a/boards/pca10005/include/board.h +++ b/boards/pca10005/include/board.h @@ -32,7 +32,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (24) #define XTIMER_BACKOFF (40) diff --git a/boards/remote-common/include/board_common.h b/boards/remote-common/include/board_common.h index c71d8fb72..42ec7ed82 100644 --- a/boards/remote-common/include/board_common.h +++ b/boards/remote-common/include/board_common.h @@ -77,7 +77,7 @@ * @name xtimer configuration * @{ */ -#define XTIMER TIMER_0 +#define XTIMER_DEV TIMER_0 #define XTIMER_CHAN (0) #define XTIMER_SHIFT (-4) #define XTIMER_BACKOFF (50) diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h index 7dc19412d..d59f053ce 100644 --- a/boards/samr21-xpro/include/board.h +++ b/boards/samr21-xpro/include/board.h @@ -34,7 +34,7 @@ extern "C" { * @brief xtimer configuration * @{ */ -#define XTIMER TIMER_1 +#define XTIMER_DEV TIMER_1 #define XTIMER_CHAN (0) /** @} */ diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h index 9808380b7..41925c140 100644 --- a/boards/stm32f4discovery/include/board.h +++ b/boards/stm32f4discovery/include/board.h @@ -32,7 +32,7 @@ extern "C" { * @name xtimer configuration * @{ */ -#define XTIMER TIMER_0 +#define XTIMER_DEV TIMER_0 #define XTIMER_CHAN (0) #define XTIMER_OVERHEAD (6) #define XTIMER_BACKOFF (10) diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h index e5136a19f..dd03ca175 100644 --- a/boards/telosb/include/board.h +++ b/boards/telosb/include/board.h @@ -54,7 +54,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (16) #define XTIMER_BACKOFF (40) diff --git a/boards/wsn430-common/include/board_common.h b/boards/wsn430-common/include/board_common.h index 08734f92f..53cb6bfe9 100644 --- a/boards/wsn430-common/include/board_common.h +++ b/boards/wsn430-common/include/board_common.h @@ -37,7 +37,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (16) #define XTIMER_BACKOFF (40) diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h index 2442f045e..610a00ede 100644 --- a/boards/yunjia-nrf51822/include/board.h +++ b/boards/yunjia-nrf51822/include/board.h @@ -31,7 +31,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (24) #define XTIMER_BACKOFF (40) diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h index 0e2fde78a..09122ead9 100644 --- a/boards/z1/include/board.h +++ b/boards/z1/include/board.h @@ -48,7 +48,7 @@ extern "C" { * @brief Xtimer configuration * @{ */ -#define XTIMER (0) +#define XTIMER_DEV (0) #define XTIMER_CHAN (0) #define XTIMER_WIDTH (16) #define XTIMER_BACKOFF (40) diff --git a/sys/include/xtimer.h b/sys/include/xtimer.h index 51957d958..9746450b9 100644 --- a/sys/include/xtimer.h +++ b/sys/include/xtimer.h @@ -344,11 +344,11 @@ int xtimer_msg_receive_timeout64(msg_t *msg, uint64_t us); /* * Default xtimer configuration */ -#ifndef XTIMER +#ifndef XTIMER_DEV /** * @brief Underlying hardware timer device to assign to xtimer */ -#define XTIMER TIMER_DEV(0) +#define XTIMER_DEV TIMER_DEV(0) /** * @brief Underlying hardware timer channel to assign to xtimer */ diff --git a/sys/include/xtimer/implementation.h b/sys/include/xtimer/implementation.h index 945a7c681..9eed1635b 100644 --- a/sys/include/xtimer/implementation.h +++ b/sys/include/xtimer/implementation.h @@ -59,9 +59,9 @@ extern volatile uint32_t _xtimer_high_cnt; static inline uint32_t _xtimer_lltimer_now(void) { #if XTIMER_SHIFT - return XTIMER_TICKS_TO_USEC((uint32_t)timer_read(XTIMER)); + return XTIMER_TICKS_TO_USEC((uint32_t)timer_read(XTIMER_DEV)); #else - return timer_read(XTIMER); + return timer_read(XTIMER_DEV); #endif } diff --git a/sys/xtimer/xtimer_core.c b/sys/xtimer/xtimer_core.c index cf63124d8..f87d192b8 100644 --- a/sys/xtimer/xtimer_core.c +++ b/sys/xtimer/xtimer_core.c @@ -57,7 +57,7 @@ static inline int _is_set(xtimer_t *timer) void xtimer_init(void) { /* initialize low-level timer */ - timer_init(XTIMER, XTIMER_USEC_TO_TICKS(1000000ul), _periph_timer_callback, NULL); + timer_init(XTIMER_DEV, XTIMER_USEC_TO_TICKS(1000000ul), _periph_timer_callback, NULL); /* register initial overflow tick */ _lltimer_set(0xFFFFFFFF); @@ -158,7 +158,7 @@ static inline void _lltimer_set(uint32_t target) target++; } #endif - timer_set_absolute(XTIMER, XTIMER_CHAN, _xtimer_lltimer_mask(target)); + timer_set_absolute(XTIMER_DEV, XTIMER_CHAN, _xtimer_lltimer_mask(target)); } int _xtimer_set_absolute(xtimer_t *timer, uint32_t target)