summaryrefslogtreecommitdiff
path: root/src/avr/ao_i2c_usart.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2018-10-20 01:18:12 -0600
committerBdale Garbee <bdale@gag.com>2018-10-20 01:18:12 -0600
commit0686a7b8aec524d81bda4c572549a3a068ce0eed (patch)
tree2e6061c834b99e3b9668be8b3cfb1627251365d3 /src/avr/ao_i2c_usart.c
parent6aa451ce81bfdfe679e3f9902043a5f0d235c745 (diff)
parentcc528f1ff0271ec6488a1a7b91c731183502101e (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/avr/ao_i2c_usart.c')
-rw-r--r--src/avr/ao_i2c_usart.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/avr/ao_i2c_usart.c b/src/avr/ao_i2c_usart.c
index c95548d4..67bee339 100644
--- a/src/avr/ao_i2c_usart.c
+++ b/src/avr/ao_i2c_usart.c
@@ -22,7 +22,7 @@
* Atmega32u4 TWI master mode (I2C)
*/
-__xdata uint8_t ao_i2c_mutex;
+uint8_t ao_i2c_mutex;
/* Send bytes over I2C.
*
@@ -30,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;
@@ -51,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;