X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch_funcs.h;h=5e2fc13db1ab808f8a6e5eda1607d5fe871626d5;hp=728f1f76d935507787aa6f8b6ef3749fd6720b3d;hb=a27b9b5c36cf748e415ba210c8d8ae72d8227a98;hpb=03dc80d15a2f8fe9d7340351226dadd8bc3cfdb9

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 728f1f76..5e2fc13d 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -21,9 +21,27 @@
 
 extern __xdata uint8_t	ao_spi_mutex;
 
-#define ao_spi_get_mask(reg,mask,bus) do {		\
-	ao_mutex_get(&ao_spi_mutex); \
-	(reg) &= ~(mask); \
+#define AO_SPI_SPEED_FAST	17
+#define AO_SPI_SPEED_200kHz	13
+
+#define ao_spi_set_speed(speed) (U0GCR = (UxGCR_CPOL_NEGATIVE |		\
+					  UxGCR_CPHA_FIRST_EDGE |	\
+					  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);		\
+		(reg) &= ~(mask);			\
 	} while (0)
 
 #define ao_spi_put_mask(reg,mask,bus) do {		\
@@ -31,8 +49,10 @@ extern __xdata uint8_t	ao_spi_mutex;
 	ao_mutex_put(&ao_spi_mutex); \
 	} while (0)
 
-#define ao_spi_get_bit(reg,bit,pin,bus) do {	\
+
+#define ao_spi_get_bit(reg,bit,pin,bus,speed) do {	\
 		ao_mutex_get(&ao_spi_mutex);	\
+		ao_spi_set_speed(speed);	\
 		pin = 0;			\
 	} while (0)
 
@@ -66,14 +86,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))