diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-02-25 18:30:08 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-02-25 18:30:08 -0700 |
| commit | 338372b97d441c30d2a23df540163a66a7f8d8c0 (patch) | |
| tree | 65544591dbc34d449af0f7fd6c0c0eb4cb075f6b /src/stmf0 | |
| parent | 8d0df64bbc5ed31188b4b4bea0be52a52dbece3b (diff) | |
| parent | cd920a0e5321166ef8b1d6afc3d63fc5de998a93 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/stmf0')
| -rw-r--r-- | src/stmf0/ao_arch.h | 5 | ||||
| -rw-r--r-- | src/stmf0/ao_timer.c | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h index e5f7e1f7..d70a9110 100644 --- a/src/stmf0/ao_arch.h +++ b/src/stmf0/ao_arch.h @@ -32,11 +32,6 @@ #define AO_LED_TYPE uint16_t -#ifndef AO_TICK_TYPE -#define AO_TICK_TYPE uint16_t -#define AO_TICK_SIGNED int16_t -#endif - #define AO_PORT_TYPE uint16_t /* Various definitions to make GCC look more like SDCC */ 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; |