TeleScience and TelePyro now work.
Signed-off-by: Keith Packard <keithp@keithp.com>
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
#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)))
}
void
-ao_spi_write(uint8_t *buf, uint8_t len)
+ao_spi_slave_send(uint8_t *buf, uint8_t len)
{
while (len--) {
SPDR = *buf++;
}
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:
*/
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);
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;
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;