X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_arch_funcs.h;h=1bbb14f5b8773338a643ea1b7488cde0f8e319a1;hb=23f11b188fc6aacd29e7f01a7d8a40853b7655df;hp=204d1227dd5f525d02579efd85dac30db4a55096;hpb=3fe11b277dd7268eb445d120c8f9537f95148891;p=fw%2Faltos

diff --git a/src/lpc/ao_arch_funcs.h b/src/lpc/ao_arch_funcs.h
index 204d1227..1bbb14f5 100644
--- a/src/lpc/ao_arch_funcs.h
+++ b/src/lpc/ao_arch_funcs.h
@@ -51,12 +51,20 @@
 			    (1 << LPC_IOCONF_ADMODE));			\
 	} while (0)
 
-#define ao_enable_analog(port,bit) do {					\
-		vuint32_t *_ioconf = &lpc_ioconf.pio0_0 + ((port)*24+(bit)); \
+#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);			\
-		*_ioconf = *_ioconf & ~((1 << LPC_IOCONF_ADMODE) |	\
-					(LPC_IOCONF_MODE_MASK << LPC_IOCONF_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))