X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_arch_funcs.h;h=f2a58af017282534b2071ed37e914a4fb106e2a7;hb=cdaa0d7b272505c49017f409b7c0b8e3240608f0;hp=792ff7440bf724d5e824abf351cd391891a52a0a;hpb=0cfd22baa6af44e053428c30c1a95cf5551b68af;p=fw%2Faltos

diff --git a/src/avr/ao_arch_funcs.h b/src/avr/ao_arch_funcs.h
index 792ff744..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,7 +20,7 @@
  * ao_spi.c
  */
 
-extern __xdata uint8_t	ao_spi_mutex;
+extern uint8_t	ao_spi_mutex;
 
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
 		ao_mutex_get(&ao_spi_mutex);	\
@@ -31,12 +32,12 @@ extern __xdata uint8_t	ao_spi_mutex;
 		ao_mutex_put(&ao_spi_mutex);	\
 	} while (0)
 
-#define ao_spi_get_bit(reg,bit,pin,bus,speed) do {	\
+#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(reg,bit,pin,bus) do {	\
+#define ao_spi_put_bit(reg,bit,bus) do {	\
 		(pin) = 1;			\
 		ao_mutex_put(&ao_spi_mutex);	\
 	} while (0)
@@ -45,7 +46,7 @@ extern __xdata uint8_t	ao_spi_mutex;
 #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, pin, v) do {				\
+#define ao_gpio_set(port, bit, v) do {				\
 		if (v)							\
 			(ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
 		else							\
@@ -58,17 +59,17 @@ extern __xdata uint8_t	ao_spi_mutex;
  * from chip select low to chip select high
  */
 
-#define ao_enable_output(port, bit, pin, v) do {			\
-		ao_gpio_set(port, bit, pin, v);				\
+#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)