summaryrefslogtreecommitdiff
path: root/src/stm/ao_timer.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2019-02-25 18:30:08 -0700
committerBdale Garbee <bdale@gag.com>2019-02-25 18:30:08 -0700
commit338372b97d441c30d2a23df540163a66a7f8d8c0 (patch)
tree65544591dbc34d449af0f7fd6c0c0eb4cb075f6b /src/stm/ao_timer.c
parent8d0df64bbc5ed31188b4b4bea0be52a52dbece3b (diff)
parentcd920a0e5321166ef8b1d6afc3d63fc5de998a93 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/stm/ao_timer.c')
-rw-r--r--src/stm/ao_timer.c17
1 files changed, 17 insertions, 0 deletions
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