X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_arch_funcs.h;h=e400c98b62468a25ce961592e2171de5fe586476;hb=933fc7e4c2f617e49e1cfdf45b83695290b51456;hp=9ad14fbbad0144e4b960c32be95a82244c293a67;hpb=cf1e4d60e1fcd75fa734365a2666ea8930938128;p=fw%2Faltos

diff --git a/src/avr/ao_arch_funcs.h b/src/avr/ao_arch_funcs.h
index 9ad14fbb..e400c98b 100644
--- a/src/avr/ao_arch_funcs.h
+++ b/src/avr/ao_arch_funcs.h
@@ -21,24 +21,24 @@
 
 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_get_mask(reg,mask,bus,speed) do {	\
+		ao_mutex_get(&ao_spi_mutex);	\
+		(reg) &= ~(mask);		\
 	} while (0)
 
-#define ao_spi_put_mask(reg,mask) do { \
-	(reg) |= (mask); \
-	ao_mutex_put(&ao_spi_mutex); \
+#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);	\
+		(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)
 
 /*
@@ -48,11 +48,18 @@ 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);		\
+	} while (0)