first cut at turnon scripts for EasyTimer v2

[fw/altos] / src / lpc / ao_timer_lpc.c

diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c
index 166e2f154aa135feab827b5bb3fde19a9ed14f31..7bd56445e8ba0599d4e92f9a0d309696ac5127d2 100644 (file)
--- a/src/lpc/ao_timer_lpc.c
+++ b/src/lpc/ao_timer_lpc.c
@@ -17,28 +17,44 @@
  */
 
 #include <ao.h>
+#include <ao_task.h>
 
-volatile __data AO_TICK_TYPE ao_tick_count;
+#define AO_SYSTICK     (AO_LPC_SYSCLK / 2)
 
-uint16_t
+volatile AO_TICK_TYPE ao_tick_count;
+
+AO_TICK_TYPE
 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 __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 lpc_systick_isr(void)
 {
        if (lpc_systick.csr & (1 << LPC_SYSTICK_CSR_COUNTFLAG)) {
                ++ao_tick_count;
-#if HAS_TASK_QUEUE
-               if (ao_task_alarm_tick && (int16_t) (ao_tick_count - ao_task_alarm_tick) >= 0)
-                       ao_task_check_alarm((uint16_t) ao_tick_count);
-#endif
+               ao_task_check_alarm();
 #if AO_DATA_ALL
                if (++ao_data_count == ao_data_interval) {
                        ao_data_count = 0;
@@ -105,13 +121,13 @@ ao_clock_init(void)
         * make sure the flash part remains happy
         */
 
-       lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_BOD_PD);
+       lpc_scb.pdruncfg &= ~(1UL << LPC_SCB_PDRUNCFG_BOD_PD);
        lpc_scb.bodctrl = ((LPC_SCB_BOD_BODRSTLEV_2_63 << LPC_SCB_BOD_BODRSTLEV) |
                           (LPC_SCB_BOD_BODINTVAL_RESERVED << LPC_SCB_BOD_BODINTVAL) |
                           (1 << LPC_SCB_BOD_BODRSTENA));
 
        /* Turn the IRC clock back on */
-       lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_IRC_PD);
+       lpc_scb.pdruncfg &= ~(1UL << LPC_SCB_PDRUNCFG_IRC_PD);
        ao_clock_delay();
 
        /* Switch to the IRC clock */
@@ -142,7 +158,7 @@ ao_clock_init(void)
 
        /* Set PLL divider values */
        lpc_scb.syspllctrl = ((AO_LPC_M << LPC_SCB_SYSPLLCTRL_MSEL) |
-                             (p << LPC_SCB_SYSPLLCTRL_PSEL));
+                             ((uint32_t) p << LPC_SCB_SYSPLLCTRL_PSEL));
 
        /* Turn off the external crystal clock */
        lpc_scb.pdruncfg |= (1 << LPC_SCB_PDRUNCFG_SYSOSC_PD);
@@ -153,7 +169,7 @@ ao_clock_init(void)
                              ((AO_LPC_CLKIN > 15000000) << LPC_SCB_SYSOSCCTRL_FREQRANGE));/* set range */
 
        /* Turn on the external crystal clock */
-       lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_SYSOSC_PD);
+       lpc_scb.pdruncfg &= ~(1UL << LPC_SCB_PDRUNCFG_SYSOSC_PD);
        ao_clock_delay();
 
        /* Select crystal as PLL input */
@@ -166,7 +182,7 @@ ao_clock_init(void)
                ;
 
        /* Turn on the PLL */
-       lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_SYSPLL_PD);
+       lpc_scb.pdruncfg &= ~(1UL << LPC_SCB_PDRUNCFG_SYSPLL_PD);
 
        /* Wait for it to lock */