RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:12:57 +01:00
Code Releases Activity

xtimer: Rename XTIMER -> XTIMER_DEV

Browse Source
This commit is contained in:
Joakim Nohlgård 2016-07-05 16:45:41 +02:00
parent 2f832117f8
commit 4d862955c2
20 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/airfy-beacon/include/board.h
View File

@ -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)

2
boards/cc2538dk/include/board.h
View File

@ -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)

2
boards/chronos/include/board.h
View File

@ -38,7 +38,7 @@ extern "C" {
* @brief Xtimer configuration
* @{
*/
#define XTIMER (0)
#define XTIMER_DEV (0)
#define XTIMER_CHAN (0)
#define XTIMER_WIDTH (16)
/** @} */

2
boards/msb-430-common/include/board_common.h
View File

@ -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)

2
boards/nrf51dongle/include/board.h
View File

@ -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)

2
boards/nucleo-f401/include/board.h
View File

@ -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)

2
boards/nucleo-l1/include/board.h
View File

@ -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)

2
boards/openmote-cc2538/include/board.h
View File

@ -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)

2
boards/pca10000/include/board.h
View File

@ -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)

2
boards/pca10005/include/board.h
View File

@ -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)

2
boards/remote-common/include/board_common.h
View File

@ -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)

2
boards/samr21-xpro/include/board.h
View File

@ -34,7 +34,7 @@ extern "C" {
* @brief xtimer configuration
* @{
*/
#define XTIMER TIMER_1
#define XTIMER_DEV TIMER_1
#define XTIMER_CHAN (0)
/** @} */

2
boards/stm32f4discovery/include/board.h
View File

@ -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)

2
boards/telosb/include/board.h
View File

@ -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)

2
boards/wsn430-common/include/board_common.h
View File

@ -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)

2
boards/yunjia-nrf51822/include/board.h
View File

@ -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)

2
boards/z1/include/board.h
View File

@ -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)

4
sys/include/xtimer.h
View File

@ -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
*/

4
sys/include/xtimer/implementation.h
View File

@ -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
}

4
sys/xtimer/xtimer_core.c
View File

@ -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)