X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_arch.h;h=bbd1b3b1f33e50a90bed62d4178fd689789f77d6;hb=419a801131c1034f1fa149a67850290431cbda72;hp=ce3a22e262e6ce8c7a7c330c3aa66b732b9b4620;hpb=5e41d1e03680af9806c599aad80b9b64dd719f9b;p=fw%2Faltos

diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index ce3a22e2..bbd1b3b1 100644
--- a/src/stm/ao_arch.h
+++ b/src/stm/ao_arch.h
@@ -42,7 +42,9 @@
 #define __interrupt(n)
 #define __at(n)
 
-#define ao_arch_reboot()	/* XXX */
+#define CORTEX_M3_AIRCR		((uint32_t *) 0xe000ed0c)
+
+#define ao_arch_reboot()	(*((uint32_t *) 0xe000ed0c) = 0x05fa0004)
 
 #define ao_arch_nop()		asm("nop")
 
@@ -72,12 +74,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);					\
 									\
@@ -86,23 +82,29 @@ 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 {					\
@@ -121,23 +123,21 @@ extern const uint16_t ao_serial_number;
 
 #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");						\
@@ -148,7 +148,30 @@ extern const uint16_t ao_serial_number;
 /*
  * For now, we're running at a weird frequency
  */
-#define STM_APB1	(16000000 * 6 / 4)
+
+#if AO_HSE
+#define AO_PLLSRC	AO_HSE
+#else
+#define AO_PLLSRC	STM_HSI_FREQ
+#endif
+
+#define AO_PLLVCO	(AO_PLLSRC * AO_PLLMUL)
+#define AO_SYSCLK	(AO_PLLVCO / AO_PLLDIV)
+#define AO_HCLK		(AO_SYSCLK / AO_AHB_PRESCALER)
+#define AO_PCLK1	(AO_HCLK / AO_APB1_PRESCALER)
+#define AO_PCLK2	(AO_HCLK / AO_APB2_PRESCALER)
+
+#if AO_APB1_PRESCALER == 1
+#define AO_TIM23467_CLK		AO_PCLK1
+#else
+#define AO_TIM23467_CLK		(2 * AO_PCLK1)
+#endif
+
+#if AO_APB2_PRESCALER == 1
+#define AO_TIM91011_CLK		AO_PCLK2
+#else
+#define AO_TIM91011_CLK		(2 * AO_PCLK2)
+#endif
 
 void ao_lcd_stm_init(void);
 
@@ -156,8 +179,6 @@ 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);