X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_arch_funcs.h;h=f2a58af017282534b2071ed37e914a4fb106e2a7;hb=cdaa0d7b272505c49017f409b7c0b8e3240608f0;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..f2a58af0 100644
--- a/src/avr/ao_arch_funcs.h
+++ b/src/avr/ao_arch_funcs.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,26 +20,37 @@
  * ao_spi.c
  */
 
-extern __xdata uint8_t	ao_spi_mutex;
+extern 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,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,bus) do {	\
+		(pin) = 1;			\
+		ao_mutex_put(&ao_spi_mutex);	\
+	} while (0)
+
+
+#define ao_gpio_token_paster(x,y)		x ## y
+#define ao_gpio_token_evaluator(x,y)	ao_gpio_token_paster(x,y)
+
+#define ao_gpio_set(port, bit, v) do {				\
+		if (v)							\
+			(ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
+		else							\
+			(ao_gpio_token_evaluator(PORT,port)) &= ~(1 << bit); \
 	} while (0)
 
 /*
@@ -47,12 +59,25 @@ extern __xdata uint8_t	ao_spi_mutex;
  * from chip select low to chip select high
  */
 
+#define ao_enable_output(port, bit, v) do {			\
+		ao_gpio_set(port, bit, v);				\
+		ao_gpio_token_evaluator(DDR,port) |= (1 << bit);	\
+	} while (0)
+
+
 void
-ao_spi_send(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_send_bus(void *block, uint16_t len);
 
 void
-ao_spi_recv(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_recv_bus(void *block, uint16_t len);
+
+#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)