Bump to 1.0.9.3 1.0.9.3
authorKeith Packard <keithp@keithp.com>
Wed, 12 Oct 2011 02:58:04 +0000 (20:58 -0600)
committerKeith Packard <keithp@keithp.com>
Wed, 12 Oct 2011 02:58:04 +0000 (20:58 -0600)
TeleScience and TelePyro now work.

Signed-off-by: Keith Packard <keithp@keithp.com>
configure.ac
src/avr/ao_spi_slave.c
src/avr/ao_usb_avr.c
src/core/ao.h
src/drivers/ao_pyro_slave.c
src/drivers/ao_science_slave.c

index 57d2f19..19db6d2 100644 (file)
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.0.9.2)
+AC_INIT([altos], 1.0.9.3)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
index 3aa0b97..b742d29 100644 (file)
@@ -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++;
index 74bdea2..fc8899d 100644 (file)
@@ -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:
index c047472..94526bc 100644 (file)
@@ -975,10 +975,10 @@ ao_spi_init(void);
  */
 
 uint8_t
-ao_spi_read(uint8_t *buf, uint8_t len);
+ao_spi_slave_recv(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);
 
 void
 ao_spi_slave_init(void);
index e6c73a3..5ef42b5 100644 (file)
@@ -29,19 +29,19 @@ static const struct ao_companion_setup      ao_telepyro_setup = {
 
 void ao_spi_slave(void)
 {
-       if (!ao_spi_read((uint8_t *) &ao_companion_command,
-                        sizeof (ao_companion_command)))
+       if (!ao_spi_slave_recv((uint8_t *) &ao_companion_command,
+                              sizeof (ao_companion_command)))
                return;
 
        /* Figure out the outbound data */
        switch (ao_companion_command.command) {
        case AO_COMPANION_SETUP:
-               ao_spi_write((uint8_t *) &ao_telepyro_setup,
-                            sizeof (ao_telepyro_setup));
+               ao_spi_slave_send((uint8_t *) &ao_telepyro_setup,
+                                 sizeof (ao_telepyro_setup));
                break;
        case AO_COMPANION_FETCH:
-               ao_spi_write((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
-                            AO_TELEPYRO_NUM_ADC * sizeof (uint16_t));
+               ao_spi_slave_send((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
+                                 AO_TELEPYRO_NUM_ADC * sizeof (uint16_t));
                break;
        case AO_COMPANION_NOTIFY:
                break;
index 7894125..1ebb148 100644 (file)
@@ -29,19 +29,19 @@ static const struct ao_companion_setup      ao_telescience_setup = {
 
 void ao_spi_slave(void)
 {
-       if (!ao_spi_read((uint8_t *) &ao_companion_command,
-                        sizeof (ao_companion_command)))
+       if (!ao_spi_slave_recv((uint8_t *) &ao_companion_command,
+                              sizeof (ao_companion_command)))
                return;
 
        /* Figure out the outbound data */
        switch (ao_companion_command.command) {
        case AO_COMPANION_SETUP:
-               ao_spi_write((uint8_t *) &ao_telescience_setup,
-                            sizeof (ao_telescience_setup));
+               ao_spi_slave_send((uint8_t *) &ao_telescience_setup,
+                                 sizeof (ao_telescience_setup));
                break;
        case AO_COMPANION_FETCH:
-               ao_spi_write((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
-                            AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
+               ao_spi_slave_send((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
+                                 AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
                break;
        case AO_COMPANION_NOTIFY:
                break;