X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_timer_lpc.c;h=7bd56445e8ba0599d4e92f9a0d309696ac5127d2;hb=e80a45c1565b14479e3a4cfc968d49b13cef4fe0;hp=62b16318107f74fc354783ab8520390ac54d524b;hpb=338372b97d441c30d2a23df540163a66a7f8d8c0;p=fw%2Faltos

diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c
index 62b16318..7bd56445 100644
--- a/src/lpc/ao_timer_lpc.c
+++ b/src/lpc/ao_timer_lpc.c
@@ -17,6 +17,7 @@
  */
 
 #include <ao.h>
+#include <ao_task.h>
 
 #define AO_SYSTICK	(AO_LPC_SYSCLK / 2)
 
@@ -53,10 +54,7 @@ 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;
@@ -123,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 */
@@ -160,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);
@@ -171,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 */
@@ -184,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 */