X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_arch.h;h=05bb97d9cb3a8cbf9c7fe314f512a095fede33f5;hb=HEAD;hp=35dcc9de57e2ad58286beab8d3f7cb5cfe67d45d;hpb=0686a7b8aec524d81bda4c572549a3a068ce0eed;p=fw%2Faltos

diff --git a/src/lpc/ao_arch.h b/src/lpc/ao_arch.h
index 35dcc9de..05bb97d9 100644
--- a/src/lpc/ao_arch.h
+++ b/src/lpc/ao_arch.h
@@ -29,15 +29,11 @@
 #define AO_STACK_SIZE	512
 #endif
 
+#define AO_GPIO_TYPE	uint8_t
 #define AO_PORT_TYPE	uint32_t
 
 #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))
@@ -58,10 +54,8 @@
  * ao_romconfig.c
  */
 
-#define AO_ROMCONFIG_SYMBOL __attribute__((section(".romconfig"))) const
-
-#define ao_arch_task_members\
-	uint32_t *sp;			/* saved stack pointer */
+#define AO_ROMCONFIG_SYMBOL __attribute__((section(".init.1"))) const
+#define AO_USBCONFIG_SYMBOL __attribute__((section(".init.2"))) const
 
 #define ao_arch_block_interrupts()	asm("cpsid i")
 #define ao_arch_release_interrupts()	asm("cpsie i")
@@ -110,18 +104,29 @@ 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
+#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
+
+static inline uint32_t
+ao_spi_speed(int index, uint32_t hz)
+{
+	(void) index;
+	if (hz >= 4000000) return _AO_SPI_SPEED_4MHz;
+	if (hz >= 2000000) return _AO_SPI_SPEED_2MHz;
+	if (hz >= 1000000) return _AO_SPI_SPEED_1MHz;
+	if (hz >=  500000) return _AO_SPI_SPEED_500kHz;
+	if (hz >=  250000) return _AO_SPI_SPEED_250kHz;
+	if (hz >=  125000) return _AO_SPI_SPEED_125kHz;
+	return _AO_SPI_SPEED_62500Hz;
+}
 
 #define AO_BOOT_APPLICATION_BASE	((uint32_t *) 0x00001000)
 #define AO_BOOT_APPLICATION_BOUND	((uint32_t *) (0x00000000 + 32 * 1024))