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

diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index d0dd3c79..0c3cfc91 100644
--- a/src/stm/ao_arch.h
+++ b/src/stm/ao_arch.h
@@ -31,6 +31,7 @@
 
 #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 */
@@ -42,7 +43,6 @@
 #define __xdata
 #define __code const
 #define __reentrant
-#define __critical
 #define __interrupt(n)
 #define __at(n)
 
@@ -82,8 +82,29 @@ extern const uint32_t ao_radio_cal;
 #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); \
@@ -142,7 +163,7 @@ extern const uint32_t ao_radio_cal;
 
 
 #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 { \