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

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 0a322961..8f1cc094 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -29,6 +29,15 @@ extern __xdata uint8_t	ao_spi_mutex;
 					  UxGCR_ORDER_MSB |		\
 					  ((speed) << UxGCR_BAUD_E_SHIFT)))
 
+#define ao_spi_get_slave(bus) do {			\
+		ao_mutex_get(&ao_spi_mutex);		\
+		ao_spi_set_speed(AO_SPI_SPEED_FAST);	\
+	} while (0)
+
+#define ao_spi_put_slave(bus) do {		\
+		ao_mutex_put(&ao_spi_mutex);	\
+	} while (0)
+
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
 		ao_mutex_get(&ao_spi_mutex);		\
 		ao_spi_set_speed(speed);		\
@@ -68,6 +77,14 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant;
 #define ao_spi_send(block, len, bus) ao_spi_send_bus(block, len)
 #define ao_spi_recv(block, len, bus) ao_spi_recv_bus(block, len)
 
+#if AO_SPI_SLAVE
+void
+ao_spi_send_wait(void);
+
+void
+ao_spi_recv_wait(void);
+#endif
+
 void
 ao_spi_init(void);
 
@@ -77,14 +94,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))