X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_timer.c;h=d00deffab2161b80e0333f6524567deefdb87052;hb=338372b97d441c30d2a23df540163a66a7f8d8c0;hp=9d118b721349d2198f69e37f7e32dd73ee593734;hpb=f16d1e3a2f074b96aae6b9053e8e9e03bd282741;p=fw%2Faltos diff --git a/src/stm/ao_timer.c b/src/stm/ao_timer.c index 9d118b72..d00deffa 100644 --- a/src/stm/ao_timer.c +++ b/src/stm/ao_timer.c @@ -36,11 +36,28 @@ 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 -volatile __data uint8_t ao_data_interval = 1; -volatile __data uint8_t ao_data_count; +volatile uint8_t ao_data_interval = 1; +volatile uint8_t ao_data_count; #endif void stm_systick_isr(void)