summaryrefslogtreecommitdiff
path: root/src/avr
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-10-11 20:58:04 -0600
committerKeith Packard <keithp@keithp.com>2011-10-11 20:58:04 -0600
commit47c2c0b79dc516d2566ae149605b7d70ef2dca98 (patch)
treee0e922b1c67c0f19c31dd0d25ec29c3d8baa5a94 /src/avr
parent652c024ed37bfed5de17f45c772796d5cbe4599f (diff)
Bump to 1.0.9.31.0.9.3
TeleScience and TelePyro now work. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/avr')
-rw-r--r--src/avr/ao_spi_slave.c4
-rw-r--r--src/avr/ao_usb_avr.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/avr/ao_spi_slave.c b/src/avr/ao_spi_slave.c
index 3aa0b97f..b742d29a 100644
--- a/src/avr/ao_spi_slave.c
+++ b/src/avr/ao_spi_slave.c
@@ -18,7 +18,7 @@
#include "ao.h"
uint8_t
-ao_spi_read(uint8_t *buf, uint8_t len)
+ao_spi_slave_recv(uint8_t *buf, uint8_t len)
{
while (len--) {
while (!(SPSR & (1 << SPIF)))
@@ -30,7 +30,7 @@ ao_spi_read(uint8_t *buf, uint8_t len)
}
void
-ao_spi_write(uint8_t *buf, uint8_t len)
+ao_spi_slave_send(uint8_t *buf, uint8_t len)
{
while (len--) {
SPDR = *buf++;
diff --git a/src/avr/ao_usb_avr.c b/src/avr/ao_usb_avr.c
index 74bdea23..fc8899d8 100644
--- a/src/avr/ao_usb_avr.c
+++ b/src/avr/ao_usb_avr.c
@@ -303,9 +303,6 @@ ao_usb_ep0_setup(void)
}
break;
case AO_USB_RECIP_INTERFACE:
-#ifndef AVR
- #pragma disable_warning 110
-#endif
debug ("Interface setup packet\n");
switch(ao_usb_setup.request) {
case AO_USB_REQ_GET_STATUS: