doc: Add 1.9 release notes

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

diff --git a/src/avr/ao_i2c_usart.c b/src/avr/ao_i2c_usart.c
index 60e35f8c770750e8e76ec36c79b8256af6926b19..67bee339d28732adc8523fc3101dc98ec3f45b07 100644 (file)
--- a/src/avr/ao_i2c_usart.c
+++ b/src/avr/ao_i2c_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 TWI master mode (I2C)
  */
 
-__xdata uint8_t        ao_i2c_mutex;
+uint8_t        ao_i2c_mutex;
 
 /* Send bytes over I2C.
  *
@@ -29,7 +30,7 @@ __xdata uint8_t       ao_i2c_mutex;
  * so using interrupts would take way too long
  */
 void
-ao_i2c_send(void __xdata *block, uint16_t len) __reentrant
+ao_i2c_send(void *block, uint16_t len) 
 {
        uint8_t *d = block;
 
@@ -50,7 +51,7 @@ ao_i2c_send(void __xdata *block, uint16_t len) __reentrant
  * clocks the data coming in.
  */
 void
-ao_i2c_recv(void __xdata *block, uint16_t len) __reentrant
+ao_i2c_recv(void *block, uint16_t len) 
 {
        uint8_t *d = block;