X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_arch.h;h=da21dc9d1779ff7d3b67fc30c0a6d145e07ba4c9;hb=refs%2Fheads%2Fbdale-ui;hp=5fbb8dfaa0f24183341d1d78dbbc49e80cdf16b3;hpb=8124af8c27b2b9e446aa3a4f1da83d4db7c1ea87;p=fw%2Faltos

diff --git a/src/lpc/ao_arch.h b/src/lpc/ao_arch.h
index 5fbb8dfa..93676b86 100644
--- a/src/lpc/ao_arch.h
+++ b/src/lpc/ao_arch.h
@@ -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
@@ -32,20 +33,10 @@
 
 #define AO_LED_TYPE	AO_PORT_TYPE
 
-#ifndef AO_TICK_TYPE
-#define AO_TICK_TYPE	uint16_t
-#define AO_TICK_SIGNED	int16_t
-#endif
-
 /* Various definitions to make GCC look more like SDCC */
 
 #define ao_arch_naked_declare	__attribute__((naked))
 #define ao_arch_naked_define
-#define __pdata
-#define __data
-#define __xdata
-#define __code const
-#define __reentrant
 #define __interrupt(n)
 #define __at(n)
 
@@ -58,29 +49,11 @@
 
 #define ao_arch_interrupt(n)	/* nothing */
 
-#undef putchar
-#undef getchar
-#define putchar(c)	ao_putchar(c)
-#define getchar		ao_getchar
-
-extern void putchar(char c);
-extern char getchar(void);
-
 /*
  * ao_romconfig.c
  */
 
-#define AO_ROMCONFIG_VERSION	2
-
-#define AO_ROMCONFIG_SYMBOL(a) __attribute__((section(".romconfig"))) const
-
-extern const uint16_t ao_romconfig_version;
-extern const uint16_t ao_romconfig_check;
-extern const uint16_t ao_serial_number;
-extern const uint32_t ao_radio_cal;
-
-#define ao_arch_task_members\
-	uint32_t *sp;			/* saved stack pointer */
+#define AO_ROMCONFIG_SYMBOL __attribute__((section(".romconfig"))) const
 
 #define ao_arch_block_interrupts()	asm("cpsid i")
 #define ao_arch_release_interrupts()	asm("cpsie i")
@@ -130,12 +103,15 @@ ao_serial_init(void);
 /* SPI definitions */
 
 #define AO_SPI_SPEED_12MHz		4
+#define AO_SPI_SPEED_8MHz		6
 #define AO_SPI_SPEED_6MHz		8
 #define AO_SPI_SPEED_4MHz		12
 #define AO_SPI_SPEED_2MHz		24
 #define AO_SPI_SPEED_1MHz		48
 #define AO_SPI_SPEED_500kHz		96
 #define AO_SPI_SPEED_250kHz		192
+#define AO_SPI_SPEED_125kHz		384
+#define AO_SPI_SPEED_62500Hz		768
 
 #define AO_SPI_SPEED_FAST	AO_SPI_SPEED_12MHz