X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flpc%2Fao_arch_funcs.h;h=0891903ea5f00cb2adae5dbf57506fcdcb81a5c5;hp=179b2f4d0ae3963dba54febef71ab8889f058004;hb=8f7edcee2db30652ce0b147f282de3396c3786ad;hpb=7361371190bf3805b6d0414e61f697aca7c7cff1

diff --git a/src/lpc/ao_arch_funcs.h b/src/lpc/ao_arch_funcs.h
index 179b2f4d..0891903e 100644
--- 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,6 +50,12 @@
 			    (1 << LPC_IOCONF_ADMODE));			\
 	} while (0)
 
+#define ao_enable_input(port,bit,mode) do {				\
+		ao_enable_port(port);					\
+		lpc_gpio.dir[port] &= ~(1 << bit);			\
+		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
@@ -61,12 +66,10 @@
 #define analog_func(id)			lpc_token_evaluator_2(LPC_IOCONF_FUNC_AD,id)
 
 #define ao_enable_analog(port,bit,id) do {				\
-		uint32_t _mode;						\
 		ao_enable_port(port);					\
 		lpc_gpio.dir[port] &= ~(1 << bit);			\
-		_mode = ((analog_func(id) << LPC_IOCONF_FUNC) |		\
-			 (0 << LPC_IOCONF_ADMODE));			\
-		lpc_ioconf.analog_reg(port,bit) = _mode;		\
+		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))
@@ -89,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)
 {
@@ -155,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();				\
@@ -229,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_ */