X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch_funcs.h;h=29755b5c5c8c47d3b3e177a21b0cbad01a044189;hb=2610b316eb939c1532061646b05207fcd54d984f;hp=0a32296165a8ee7f63ee984018cef7499b6e0042;hpb=08a4ed8fe794a2b2b52147bd5535fe0954822e95;p=fw%2Faltos

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 0a322961..29755b5c 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -77,14 +77,15 @@ ao_spi_init(void);
 		SPI_CS_SEL &= ~mask;		\
 	} while (0)
 
-#define cc1111_enable_output(port,dir,sel,mask,v) do { \
-	port = port & ~(mask) | v; \
-	dir |= mask; \
-	sel &= ~mask; \
-} while (0)
+#define cc1111_enable_output(port,dir,sel,pin,bit,v) do {	\
+		pin = v;					\
+		dir |= (1 << bit);				\
+		sel &= ~(1 << bit);				\
+	} while (0)
 
 #define disable_unreachable	_Pragma("disable_warning 126")
 
 #define token_paster(x,y)	x ## y
 #define token_evaluator(x,y)	token_paster(x,y)
-#define ao_enable_output(port,pin,v) cc1111_enable_output(port,token_evaluator(port,DIR), token_evaluator(port,SEL), 1 << pin, 1 << v)
+#define ao_enable_output(port,bit,pin,v) cc1111_enable_output(port,token_evaluator(port,DIR), token_evaluator(port,SEL), pin, bit, v)
+#define ao_gpio_set(port, bit, pin, v) ((pin) = (v))