diff options
| author | Keith Packard <keithp@keithp.com> | 2019-02-25 16:42:25 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2019-02-25 16:42:25 -0700 |
| commit | cd920a0e5321166ef8b1d6afc3d63fc5de998a93 (patch) | |
| tree | 91ac01e9748a5d9395b2d30fc0ed117584c9e95c /src | |
| parent | 0448b9b638f8599633227a639ef9d8572780bbd9 (diff) | |
altos: add ao_time_ns API
This provides nano-second resolution times by reading the systick
value (which runs at 250ns ticks on stm).
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/ao.h | 4 | ||||
| -rw-r--r-- | src/lpc/ao_timer_lpc.c | 18 | ||||
| -rw-r--r-- | src/stm/ao_timer.c | 17 | ||||
| -rw-r--r-- | src/stmf0/ao_timer.c | 16 |
4 files changed, 55 insertions, 0 deletions
diff --git a/src/kernel/ao.h b/src/kernel/ao.h index c00de1fe..dddcd9cb 100644 --- a/src/kernel/ao.h +++ b/src/kernel/ao.h @@ -117,6 +117,10 @@ extern volatile AO_TICK_TYPE ao_tick_count; AO_TICK_TYPE ao_time(void); +/* Returns the current time in ns */ +uint64_t +ao_time_ns(void); + /* Suspend the current task until ticks time has passed */ void ao_delay(uint16_t ticks); diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c index 50313333..62b16318 100644 --- a/src/lpc/ao_timer_lpc.c +++ b/src/lpc/ao_timer_lpc.c @@ -18,6 +18,8 @@ #include <ao.h> +#define AO_SYSTICK (AO_LPC_SYSCLK / 2) + volatile AO_TICK_TYPE ao_tick_count; AO_TICK_TYPE @@ -26,6 +28,22 @@ ao_time(void) return ao_tick_count; } +uint64_t +ao_time_ns(void) +{ + AO_TICK_TYPE before, after; + uint32_t cvr; + + do { + before = ao_tick_count; + cvr = lpc_systick.cvr; + after = ao_tick_count; + } while (before != after); + + return (uint64_t) after * (1000000000ULL / AO_HERTZ) + + (uint64_t) cvr * (1000000000ULL / AO_SYSTICK); +} + #if AO_DATA_ALL volatile uint8_t ao_data_interval = 1; volatile uint8_t ao_data_count; diff --git a/src/stm/ao_timer.c b/src/stm/ao_timer.c index 9e9436cf..d00deffa 100644 --- a/src/stm/ao_timer.c +++ b/src/stm/ao_timer.c @@ -36,6 +36,23 @@ ao_time(void) { return ao_tick_count; } + +uint64_t +ao_time_ns(void) +{ + AO_TICK_TYPE before, after; + uint32_t cvr; + + do { + before = ao_tick_count; + cvr = stm_systick.cvr; + after = ao_tick_count; + } while (before != after); + + return (uint64_t) after * (1000000000ULL / AO_HERTZ) + + (uint64_t) cvr * (1000000000ULL / AO_SYSTICK); +} + #endif #if AO_DATA_ALL diff --git a/src/stmf0/ao_timer.c b/src/stmf0/ao_timer.c index 1def5f69..58e52995 100644 --- a/src/stmf0/ao_timer.c +++ b/src/stmf0/ao_timer.c @@ -35,6 +35,22 @@ ao_time(void) return ao_tick_count; } +uint64_t +ao_time_ns(void) +{ + AO_TICK_TYPE before, after; + uint32_t cvr; + + do { + before = ao_tick_count; + cvr = stm_systick.cvr; + after = ao_tick_count; + } while (before != after); + + return (uint64_t) after * (1000000000ULL / AO_HERTZ) + + (uint64_t) cvr * (1000000000ULL / AO_SYSTICK); +} + #if AO_DATA_ALL volatile uint8_t ao_data_interval = 1; volatile uint8_t ao_data_count; |