X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_arch_funcs.h;h=f2a58af017282534b2071ed37e914a4fb106e2a7;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hp=1eeca6cc73c0f1490cc6c1240d55fdcf46df878a;hpb=0dd9e1dd62656a931f9559af6da9131f704f83f9;p=fw%2Faltos

diff --git a/src/avr/ao_arch_funcs.h b/src/avr/ao_arch_funcs.h
index 1eeca6cc..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,9 +20,9 @@
  * ao_spi.c
  */
 
-extern __xdata uint8_t	ao_spi_mutex;
+extern uint8_t	ao_spi_mutex;
 
-#define ao_spi_get_mask(reg,mask,bus) do {	\
+#define ao_spi_get_mask(reg,mask,bus,speed) do {	\
 		ao_mutex_get(&ao_spi_mutex);	\
 		(reg) &= ~(mask);		\
 	} while (0)
@@ -31,27 +32,44 @@ extern __xdata uint8_t	ao_spi_mutex;
 		ao_mutex_put(&ao_spi_mutex);	\
 	} while (0)
 
-#define ao_spi_get_bit(bit) do {		\
+#define ao_spi_get_bit(reg,bit,bus,speed) do {	\
 		ao_mutex_get(&ao_spi_mutex);	\
-		(bit) = 0;			\
+		(pin) = 0;			\
 	} while (0)
 
-#define ao_spi_put_bit(bit) do {		\
-		(bit) = 1;			\
+#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)
+
 /*
  * The SPI mutex must be held to call either of these
  * functions -- this mutex covers the entire SPI operation,
  * 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_bus(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_send_bus(void *block, uint16_t len);
 
 void
-ao_spi_recv_bus(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)