RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #15605 from maribu/ztimer_xtimer_compat

Browse Source 
sys/ztimer: increase xtimer_compat coverage
This commit is contained in:
benpicco 2020-12-14 00:24:34 +01:00 committed by GitHub
commit cc55d4c0a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/include/ztimer/xtimer_compat.h
View File

@ -41,10 +41,18 @@ extern "C" {
*/
#ifndef DOXYGEN
#define XTIMER_WIDTH (32)
#define XTIMER_MASK (0)
typedef ztimer_t xtimer_t;
typedef uint32_t xtimer_ticks32_t;
typedef uint64_t xtimer_ticks64_t;
static inline xtimer_ticks32_t xtimer_ticks(uint32_t ticks)
{
return ticks;
}
static inline xtimer_ticks32_t xtimer_now(void)
{
return ztimer_now(ZTIMER_USEC);
@ -170,20 +178,35 @@ static inline int xtimer_mutex_lock_timeout(mutex_t *mutex, uint64_t us)
return 0;
}
static inline void xtimer_set_timeout_flag(xtimer_t *t, uint32_t timeout)
{
ztimer_set_timeout_flag(ZTIMER_USEC, t, timeout);
}
static inline void xtimer_set_timeout_flag64(xtimer_t *t, uint64_t timeout)
{
xtimer_set_timeout_flag(t, timeout);
}
static inline void xtimer_spin(xtimer_ticks32_t ticks)
{
assert(ticks < US_PER_MS);
ztimer_now_t start = ztimer_now(ZTIMER_USEC);
while (ztimer_now(ZTIMER_USEC) - start < ticks) {
/* busy waiting */
}
}
/*
static inline void xtimer_set64(xtimer_t *timer, uint64_t offset_us);
static inline void xtimer_tsleep32(xtimer_ticks32_t ticks);
static inline void xtimer_tsleep64(xtimer_ticks64_t ticks);
static inline void xtimer_spin(xtimer_ticks32_t ticks);
static inline void xtimer_periodic_wakeup(xtimer_ticks32_t *last_wakeup,
uint32_t period);
static inline void xtimer_set_wakeup64(xtimer_t *timer, uint64_t offset,
kernel_pid_t pid);
static inline xtimer_ticks32_t xtimer_ticks_from_usec(uint32_t usec);
static inline xtimer_ticks64_t xtimer_ticks_from_usec64(uint64_t usec);
static inline uint32_t xtimer_usec_from_ticks(xtimer_ticks32_t ticks);
static inline uint64_t xtimer_usec_from_ticks64(xtimer_ticks64_t ticks);
static inline xtimer_ticks32_t xtimer_ticks(uint32_t ticks);
static inline xtimer_ticks64_t xtimer_ticks64(uint64_t ticks);
static inline xtimer_ticks32_t xtimer_diff(xtimer_ticks32_t a,
xtimer_ticks32_t b);
@ -193,7 +216,6 @@ static inline int xtimer_mutex_lock_timeout(mutex_t *mutex, uint64_t us)
xtimer_ticks64_t b);
static inline bool xtimer_less(xtimer_ticks32_t a, xtimer_ticks32_t b);
static inline bool xtimer_less64(xtimer_ticks64_t a, xtimer_ticks64_t b);
void xtimer_set_timeout_flag(xtimer_t *t, uint32_t timeout);
#if defined(MODULE_CORE_MSG) || defined(DOXYGEN)
static inline void xtimer_set_msg64(xtimer_t *timer, uint64_t offset,