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

s/XTIMER_RSHIFT/XTIMER_USEC_TO_TICKS/g

Browse Source 
s/XTIMER_LSHIFT/XTIMER_TICKS_TO_USEC/g
This commit is contained in:
Ian Martin 2016-03-01 14:57:36 -05:00
parent b6fbdb2f79
commit 856c5e1539
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/include/xtimer.h
View File

@ -343,11 +343,11 @@ int xtimer_msg_receive_timeout64(msg_t *msg, uint64_t us);
#endif #endif
#if (XTIMER_SHIFT < 0) #if (XTIMER_SHIFT < 0)
#define XTIMER_RSHIFT(value) ( (value) << -XTIMER_SHIFT ) #define XTIMER_USEC_TO_TICKS(value) ( (value) << -XTIMER_SHIFT )
#define XTIMER_LSHIFT(value) ( (value) >> -XTIMER_SHIFT ) #define XTIMER_TICKS_TO_USEC(value) ( (value) >> -XTIMER_SHIFT )
#else #else
#define XTIMER_RSHIFT(value) ( (value) >> XTIMER_SHIFT ) #define XTIMER_USEC_TO_TICKS(value) ( (value) >> XTIMER_SHIFT )
#define XTIMER_LSHIFT(value) ( (value) << XTIMER_SHIFT ) #define XTIMER_TICKS_TO_USEC(value) ( (value) << XTIMER_SHIFT )
#endif #endif
/** /**
@ -383,7 +383,7 @@ int xtimer_msg_receive_timeout64(msg_t *msg, uint64_t us);
*/ */
#define XTIMER_MASK (0) #define XTIMER_MASK (0)
#endif #endif
#define XTIMER_MASK_SHIFTED XTIMER_LSHIFT(XTIMER_MASK) #define XTIMER_MASK_SHIFTED XTIMER_TICKS_TO_USEC(XTIMER_MASK)
#ifndef XTIMER_USLEEP_UNTIL_OVERHEAD #ifndef XTIMER_USLEEP_UNTIL_OVERHEAD
/** /**
@ -412,7 +412,7 @@ extern volatile uint32_t _high_cnt;
static inline uint32_t _lltimer_now(void) static inline uint32_t _lltimer_now(void)
{ {
#if XTIMER_SHIFT #if XTIMER_SHIFT
return XTIMER_LSHIFT((uint32_t)timer_read(XTIMER)); return XTIMER_TICKS_TO_USEC((uint32_t)timer_read(XTIMER));
#else #else
return timer_read(XTIMER); return timer_read(XTIMER);
#endif #endif
@ -460,7 +460,7 @@ static inline void xtimer_spin_until(uint32_t value);
/** /**
* @brief Minimal value xtimer_spin() can spin * @brief Minimal value xtimer_spin() can spin
*/ */
#define XTIMER_MIN_SPIN XTIMER_LSHIFT(1) #define XTIMER_MIN_SPIN XTIMER_TICKS_TO_USEC(1)
#endif #endif
static inline uint32_t xtimer_now(void) static inline uint32_t xtimer_now(void)

4
sys/xtimer/xtimer_core.c
View File

@ -56,7 +56,7 @@ static inline int _is_set(xtimer_t *timer)
void xtimer_init(void) void xtimer_init(void)
{ {
/* initialize low-level timer */ /* initialize low-level timer */
timer_init(XTIMER, XTIMER_RSHIFT(1000000ul), _periph_timer_callback, NULL); timer_init(XTIMER, XTIMER_USEC_TO_TICKS(1000000ul), _periph_timer_callback, NULL);
/* register initial overflow tick */ /* register initial overflow tick */
_lltimer_set(0xFFFFFFFF); _lltimer_set(0xFFFFFFFF);
@ -150,7 +150,7 @@ static inline void _lltimer_set(uint32_t target)
} }
DEBUG("_lltimer_set(): setting %" PRIu32 "\n", _lltimer_mask(target)); DEBUG("_lltimer_set(): setting %" PRIu32 "\n", _lltimer_mask(target));
#ifdef XTIMER_SHIFT #ifdef XTIMER_SHIFT
target = XTIMER_RSHIFT(target); target = XTIMER_USEC_TO_TICKS(target);
if (!target) { if (!target) {
target++; target++;
} }