X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Favr%2Fao_spi_usart.c;h=6c30b025f5935c5b69ac633aceb4f888f5c76998;hp=7c41042a4424026e99b0ea821c618a7b750298fe;hb=bed019b64d9e37f276ad5aa2dabb7681aae122ec;hpb=0dd9e1dd62656a931f9559af6da9131f704f83f9

diff --git a/src/avr/ao_spi_usart.c b/src/avr/ao_spi_usart.c
index 7c41042a..6c30b025 100644
--- a/src/avr/ao_spi_usart.c
+++ b/src/avr/ao_spi_usart.c
@@ -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
@@ -21,7 +22,7 @@
  * Atmega32u4 USART in MSPIM (master SPI mode)
  */
 
-__xdata uint8_t	ao_spi_mutex;
+uint8_t	ao_spi_mutex;
 
 /* Send bytes over SPI.
  *
@@ -29,7 +30,7 @@ __xdata uint8_t	ao_spi_mutex;
  * so using interrupts would take way too long
  */
 void
-ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
+ao_spi_send_bus(void *block, uint16_t len) 
 {
 	uint8_t	*d = block;
 
@@ -46,7 +47,7 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
  * Poll, sending zeros and reading data back
  */
 void
-ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
+ao_spi_recv_bus(void *block, uint16_t len) 
 {
 	uint8_t	*d = block;