X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_arch.h;h=87eda18b2a89878a2576d79f90bed05ab0e51a39;hp=adb6eb947a30daec3e4c6ff02c051ff3f5e69fc8;hb=583458772746317b98fced907ec780edff465888;hpb=afd52a8b54fe31577d939a161ea9cf5ad48e3a43

diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index adb6eb94..87eda18b 100644
--- a/src/stm/ao_arch.h
+++ b/src/stm/ao_arch.h
@@ -25,10 +25,15 @@
  * STM32L definitions and code fragments for AltOS
  */
 
-#define AO_STACK_SIZE	1024
+#define AO_STACK_SIZE	512
 
 #define AO_LED_TYPE	uint16_t
 
+#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))
@@ -59,7 +64,19 @@ extern void putchar(char c);
 extern char getchar(void);
 extern void ao_avr_stdio_init(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 ARM_PUSH32(stack, val)	(*(--(stack)) = (val))
 
@@ -74,12 +91,6 @@ extern const uint16_t ao_serial_number;
 		uint32_t	a = (uint32_t) start; 			\
 		int		i;					\
 									\
-		/* APSR */						\
-		ARM_PUSH32(sp, 0);					\
-									\
-		/* PRIMASK with interrupts enabled */			\
-		ARM_PUSH32(sp, 0);					\
-									\
 		/* Return address (goes into LR) */			\
 		ARM_PUSH32(sp, a);					\
 									\
@@ -88,58 +99,70 @@ extern const uint16_t ao_serial_number;
 		while (i--)						\
 			ARM_PUSH32(sp, 0);				\
 									\
+		/* APSR */						\
+		ARM_PUSH32(sp, 0);					\
+									\
+		/* PRIMASK with interrupts enabled */			\
+		ARM_PUSH32(sp, 0);					\
+									\
 		task->sp = sp;						\
 } while (0);
 	
 #define ao_arch_save_regs() 	do {					\
-		uint32_t	apsr;					\
-		uint32_t	primask;				\
+		/* Save general registers */				\
+		asm("push {r0-r12,lr}\n");				\
 									\
 		/* Save APSR */						\
-		asm("mrs %0,apsr" : "=&r" (apsr));			\
-		asm("push {%0}" : : "r" (apsr));			\
+		asm("mrs r0,apsr");					\
+		asm("push {r0}");					\
 									\
 		/* Save PRIMASK */ 					\
-		asm("mrs %0,primask" : "=&r" (primask));		\
-		asm("push {%0}" : : "r" (primask));			\
+		asm("mrs r0,primask");					\
+		asm("push {r0}");					\
 									\
-		/* Save general registers */				\
-		asm("push {r0-r12,lr}\n");				\
+		/* Enable interrupts */					\
+		sei();							\
 	} while (0)
 
 #define ao_arch_save_stack() do {					\
 		uint32_t	*sp;					\
 		asm("mov %0,sp" : "=&r" (sp) );				\
 		ao_cur_task->sp = (sp);					\
-		if ((uint8_t *) sp < ao_cur_task->stack)		\
+		if ((uint8_t *) sp < &ao_cur_task->stack[0])		\
 			ao_panic (AO_PANIC_STACK);			\
 	} while (0)
 
-#define ao_arch_isr_stack()	/* nothing */
+#if 0
+#define ao_arch_isr_stack() do {				\
+		uint32_t	*sp = (uint32_t *) 0x20004000;	\
+		asm("mov %0,sp" : "=&r" (sp) );			\
+	} while (0)
+#else
+#define ao_arch_isr_stack()
+#endif
+
 
 #define ao_arch_cpu_idle() do {			\
-		asm("wfi");			\
+		asm("wfi");		\
 	} while (0)
 
 #define ao_arch_restore_stack() do { \
 		uint32_t	sp;					\
-		uint32_t	primask;				\
-		uint32_t	apsr;					\
 		sp = (uint32_t) ao_cur_task->sp;			\
 									\
 		/* Switch stacks */					\
 		asm("mov sp, %0" : : "r" (sp) );			\
 									\
-		/* Restore general registers */				\
-		asm("pop {r0-r12,lr}\n");				\
-									\
 		/* Restore PRIMASK */					\
-		asm("pop {%0}" : "=&r" (primask) );			\
-		asm("msr primask,%0" : : "r" (primask) );		\
+		asm("pop {r0}");					\
+		asm("msr primask,r0");					\
 									\
 		/* Restore APSR */					\
-		asm("pop {%0}" : "=&r" (apsr) );			\
-		asm("msr apsr,%0" : : "r" (apsr) );			\
+		asm("pop {r0}");					\
+		asm("msr apsr,r0");					\
+									\
+		/* Restore general registers */				\
+		asm("pop {r0-r12,lr}\n");				\
 									\
 		/* Return to calling function */			\
 		asm("bx lr");						\
@@ -175,14 +198,17 @@ extern const uint16_t ao_serial_number;
 #define AO_TIM91011_CLK		(2 * AO_PCLK2)
 #endif
 
+#define AO_STM_NVIC_HIGH_PRIORITY	4
+#define AO_STM_NVIC_CLOCK_PRIORITY	6
+#define AO_STM_NVIC_MED_PRIORITY	8
+#define AO_STM_NVIC_LOW_PRIORITY	10
+
 void ao_lcd_stm_init(void);
 
 void ao_lcd_font_init(void);
 
 void ao_lcd_font_string(char *s);
 
-#define USE_SERIAL_STDIN	(USE_SERIAL_1_STDIN + USE_SERIAL_2_STDIN + USE_SERIAL_3_STDIN)
-
 char
 ao_serial1_getchar(void);
 
@@ -219,7 +245,7 @@ ao_serial3_pollchar(void);
 void
 ao_serial3_set_speed(uint8_t speed);
 
-extern uint32_t	ao_radio_cal;
+extern const uint32_t	ao_radio_cal;
 
 void
 ao_adc_init();