X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_arch.h;h=0c3cfc915f9513813a1153041249746d5e0c1bb9;hb=e80fa6de4ccc5c4851eab9fb941f9282d2e3eb16;hp=bbd1b3b1f33e50a90bed62d4178fd689789f77d6;hpb=1a294852b3607947f0f86bf236785456d8719e5f;p=fw%2Faltos

diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index bbd1b3b1..0c3cfc91 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))
@@ -38,7 +43,6 @@
 #define __xdata
 #define __code const
 #define __reentrant
-#define __critical
 #define __interrupt(n)
 #define __at(n)
 
@@ -59,15 +63,48 @@ 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))
 
 #define ao_arch_task_members\
 	uint32_t *sp;			/* saved stack pointer */
 
-#define cli()	asm("cpsid i")
-#define sei()	asm("cpsie i")
+#define ao_arch_block_interrupts()	asm("cpsid i")
+#define ao_arch_release_interrupts()	asm("cpsie i")
+
+#define cli()	ao_arch_block_interrupts()
+#define sei()	ao_arch_release_interrupts()
+
+static uint32_t
+ao_arch_irqsave(void) {
+	uint32_t	primask;
+	asm("mrs %0,primask" : "=&r" (primask));
+	ao_arch_block_interrupts();
+	return primask;
+}
+
+static void
+ao_arch_irqrestore(uint32_t primask) {
+	asm("msr primask,%0" : : "r" (primask));
+}
+
+static void
+ao_arch_memory_barrier() {
+	asm volatile("" ::: "memory");
+}
 
 #define ao_arch_init_stack(task, start) do {				\
 		uint32_t	*sp = (uint32_t *) (task->stack + AO_STACK_SIZE); \
@@ -111,14 +148,22 @@ extern const uint16_t ao_serial_number;
 		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(".global ao_idle_loc\n\twfi\nao_idle_loc:");	\
 	} while (0)
 
 #define ao_arch_restore_stack() do { \
@@ -173,6 +218,11 @@ 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);
@@ -215,7 +265,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();