X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flpc%2Fao_timer_lpc.c;h=8999c7acf1af925e67d17125320644f503811eae;hp=44fb410e7f522b642d1a68f965f46681690a3d74;hb=6fdc392ef1b624c06e26e7a053c3579435c455d5;hpb=4ff54bb96f6c00c0c2c7dd32f81403bac331621a

diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c
index 44fb410e..8999c7ac 100644
--- a/src/lpc/ao_timer_lpc.c
+++ b/src/lpc/ao_timer_lpc.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +18,7 @@
 
 #include <ao.h>
 
-volatile __data AO_TICK_TYPE ao_tick_count;
+volatile AO_TICK_TYPE ao_tick_count;
 
 uint16_t
 ao_time(void)
@@ -26,8 +27,8 @@ ao_time(void)
 }
 
 #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)
@@ -99,7 +100,7 @@ ao_clock_init(void)
 				 (1 << LPC_SCB_SYSAHBCLKCTRL_FLASHARRAY) |
 				 (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO) |
 				 (1 << LPC_SCB_SYSAHBCLKCTRL_IOCON));
-				 
+
 	/* Enable the brown-out detection at the highest voltage to
 	 * make sure the flash part remains happy
 	 */
@@ -112,21 +113,21 @@ ao_clock_init(void)
 	/* Turn the IRC clock back on */
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_IRC_PD);
 	ao_clock_delay();
-	
+
 	/* Switch to the IRC clock */
 	lpc_scb.mainclksel = LPC_SCB_MAINCLKSEL_SEL_IRC << LPC_SCB_MAINCLKSEL_SEL;
 	lpc_scb.mainclkuen = (0 << LPC_SCB_MAINCLKUEN_ENA);
 	lpc_scb.mainclkuen = (1 << LPC_SCB_MAINCLKUEN_ENA);
 	while (!(lpc_scb.mainclkuen & (1 << LPC_SCB_MAINCLKUEN_ENA)))
 		;
-	
+
 	/* Switch USB to the main clock */
 	lpc_scb.usbclksel = (LPC_SCB_USBCLKSEL_SEL_MAIN_CLOCK << LPC_SCB_USBCLKSEL_SEL);
 	lpc_scb.usbclkuen = (0 << LPC_SCB_USBCLKUEN_ENA);
 	lpc_scb.usbclkuen = (1 << LPC_SCB_USBCLKUEN_ENA);
 	while (!(lpc_scb.usbclkuen & (1 << LPC_SCB_USBCLKUEN_ENA)))
 		;
-	
+
 	/* Find a PLL post divider ratio that gets the FCCO in range */
 	for (p = 0; p < 4; p++)
 		if (AO_LPC_CLKOUT << (1 + p) >= AO_LPC_FCCO_MIN)
@@ -163,12 +164,12 @@ ao_clock_init(void)
 	lpc_scb.syspllclkuen = (1 << LPC_SCB_SYSPLLCLKUEN_ENA);
 	while (!(lpc_scb.syspllclkuen & (1 << LPC_SCB_SYSPLLCLKUEN_ENA)))
 		;
-	
+
 	/* Turn on the PLL */
 	lpc_scb.pdruncfg &= ~(1 << LPC_SCB_PDRUNCFG_SYSPLL_PD);
 
 	/* Wait for it to lock */
-	
+
 	for (i = 0; i < 20000; i++)
 		if (lpc_scb.syspllstat & (1 << LPC_SCB_SYSPLLSTAT_LOCK))
 			break;
@@ -199,7 +200,7 @@ ao_clock_init(void)
 	lpc_scb.usbpllclkuen = (1 << LPC_SCB_USBPLLCLKUEN_ENA);
 	while (!(lpc_scb.usbpllclkuen & (1 << LPC_SCB_USBPLLCLKUEN_ENA)))
 		;
-	
+
 	/* Power down everything we don't need */
 	lpc_scb.pdruncfg = ((1 << LPC_SCB_PDRUNCFG_IRCOUT_PD) |
 			    (1 << LPC_SCB_PDRUNCFG_IRC_PD) |