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

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 9ad14fbb..29755b5c 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -21,26 +21,38 @@
 
 extern __xdata uint8_t	ao_spi_mutex;
 
-#define ao_spi_get_mask(reg,mask) 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_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) do { \
+#define ao_spi_put_mask(reg,mask,bus) do {		\
 	(reg) |= (mask); \
 	ao_mutex_put(&ao_spi_mutex); \
 	} while (0)
 
-#define ao_spi_get_bit(bit) do {\
-	ao_mutex_get(&ao_spi_mutex); \
-	(bit) = 0; \
+
+#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)
 
-#define ao_spi_put_bit(bit) do { \
-	(bit) = 1; \
-	ao_mutex_put(&ao_spi_mutex); \
+#define ao_spi_put_bit(reg,bit,pin,bus) do {	\
+		pin = 1;			\
+		ao_mutex_put(&ao_spi_mutex);	\
 	} while (0)
 
+
 /*
  * The SPI mutex must be held to call either of these
  * functions -- this mutex covers the entire SPI operation,
@@ -48,11 +60,32 @@ extern __xdata uint8_t	ao_spi_mutex;
  */
 
 void
-ao_spi_send(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant;
 
 void
-ao_spi_recv(void __xdata *block, uint16_t len) __reentrant;
+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)
 
 void
 ao_spi_init(void);
 
+#define ao_spi_init_cs(port, mask) do {		\
+		SPI_CS_PORT |= mask;		\
+		SPI_CS_DIR |= mask;		\
+		SPI_CS_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,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))