Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / avr / ao_spi_usart.c

diff --git a/src/avr/ao_spi_usart.c b/src/avr/ao_spi_usart.c
index 0d509cb77660dc23bd5894d6c88b8df1ffa0c1d5..6c30b025f5935c5b69ac633aceb4f888f5c76998 100644 (file)
--- a/src/avr/ao_spi_usart.c
+++ b/src/avr/ao_spi_usart.c
@@ -22,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.
  *
@@ -30,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;
 
@@ -47,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;