altos/lpc, altos/stm: ARM requires ISB after switching stack pointers

[fw/altos] / src / lpc / ao_arch_funcs.h

diff --git a/src/lpc/ao_arch_funcs.h b/src/lpc/ao_arch_funcs.h
index 204d1227dd5f525d02579efd85dac30db4a55096..0891903ea5f00cb2adae5dbf57506fcdcb81a5c5 100644 (file)
--- a/src/lpc/ao_arch_funcs.h
+++ b/src/lpc/ao_arch_funcs.h
@@ -22,12 +22,13 @@
 #define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
 
 #define ao_enable_port(port) (lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
+#define ao_disable_port(port) (lpc_scb.sysahbclkctrl &= ~(1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
 
 #define lpc_all_bit(port,bit)  (((port) << 5) | (bit))
 
 #define ao_gpio_set(port, bit, pin, v) (lpc_gpio.byte[lpc_all_bit(port,bit)] = (v))
 
-#define ao_gpio_get(port, bit, pin)    (lpc_gpio_byte[lpc_all_bit(port,bit)])
+#define ao_gpio_get(port, bit, pin)    (lpc_gpio.byte[lpc_all_bit(port,bit)])
 
 #define ao_enable_output(port,bit,pin,v) do {                  \
                ao_enable_port(port);                           \
@@ -35,11 +36,9 @@
                lpc_gpio.dir[port] |= (1 << bit);               \
        } while (0)
 
-#define ao_enable_input(port,bit,mode) do {                            \
+#define ao_gpio_set_mode(port,bit,mode) do {                           \
                vuint32_t *_ioconf = &lpc_ioconf.pio0_0 + ((port)*24+(bit)); \
                vuint32_t _mode;                                        \
-               ao_enable_port(port);                                   \
-               lpc_gpio.dir[port] &= ~(1 << bit);                      \
                if (mode == AO_EXTI_MODE_PULL_UP)                       \
                        _mode = LPC_IOCONF_MODE_PULL_UP << LPC_IOCONF_MODE; \
                else if (mode == AO_EXTI_MODE_PULL_DOWN)                \
@@ -51,12 +50,26 @@
                            (1 << LPC_IOCONF_ADMODE));                  \
        } while (0)
 
-#define ao_enable_analog(port,bit) do {                                        \
-               vuint32_t *_ioconf = &lpc_ioconf.pio0_0 + ((port)*24+(bit)); \
+#define ao_enable_input(port,bit,mode) do {                            \
                ao_enable_port(port);                                   \
                lpc_gpio.dir[port] &= ~(1 << bit);                      \
-               *_ioconf = *_ioconf & ~((1 << LPC_IOCONF_ADMODE) |      \
-                                       (LPC_IOCONF_MODE_MASK << LPC_IOCONF_MODE)); \
+               ao_gpio_set_mode(port,bit,mode);                        \
+       } while (0)
+
+#define lpc_token_paster_2(x,y)                x ## y
+#define lpc_token_evaluator_2(x,y)     lpc_token_paster_2(x,y)
+#define lpc_token_paster_3(x,y,z)      x ## y ## z
+#define lpc_token_evaluator_3(x,y,z)   lpc_token_paster_3(x,y,z)
+#define lpc_token_paster_4(w,x,y,z)    w ## x ## y ## z
+#define lpc_token_evaluator_4(w,x,y,z) lpc_token_paster_4(w,x,y,z)
+#define analog_reg(port,bit)           lpc_token_evaluator_4(pio,port,_,bit)
+#define analog_func(id)                        lpc_token_evaluator_2(LPC_IOCONF_FUNC_AD,id)
+
+#define ao_enable_analog(port,bit,id) do {                             \
+               ao_enable_port(port);                                   \
+               lpc_gpio.dir[port] &= ~(1 << bit);                      \
+               lpc_ioconf.analog_reg(port,bit) = ((analog_func(id) << LPC_IOCONF_FUNC) | \
+                                                  (0 << LPC_IOCONF_ADMODE)); \
        } while (0)
        
 #define ARM_PUSH32(stack, val) (*(--(stack)) = (val))
@@ -79,6 +92,7 @@ ao_arch_memory_barrier() {
        asm volatile("" ::: "memory");
 }
 
+#if HAS_TASK
 static inline void
 ao_arch_init_stack(struct ao_task *task, void *start)
 {
@@ -145,6 +159,8 @@ static inline void ao_arch_restore_stack(void) {
 
 #define ao_arch_isr_stack()
 
+#endif /* HAS_TASK */
+
 #define ao_arch_wait_interrupt() do {                  \
                asm(".global ao_idle_loc\n\twfi\nao_idle_loc:");        \
                ao_arch_release_interrupts();                           \
@@ -219,6 +235,7 @@ static inline void ao_arch_start_scheduler(void) {
        asm("mrs %0,control" : "=&r" (control));
        control |= (1 << 1);
        asm("msr control,%0" : : "r" (control));
+       asm("isb");
 }
 
 #endif /* _AO_ARCH_FUNCS_H_ */