summaryrefslogtreecommitdiff
path: root/src/avr
diff options
context:
space:
mode:
Diffstat (limited to 'src/avr')
-rw-r--r--src/avr/ao_arch.h7
-rw-r--r--src/avr/ao_pins.h15
-rw-r--r--src/avr/ao_serial_avr.c62
-rw-r--r--src/avr/ao_usb.h100
-rw-r--r--src/avr/ao_usb_avr.c6
5 files changed, 46 insertions, 144 deletions
diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index b816279e..c775dab6 100644
--- a/src/avr/ao_arch.h
+++ b/src/avr/ao_arch.h
@@ -146,12 +146,5 @@ extern uint8_t ao_cpu_sleep_disable;
#define AO_TELESCIENCE_NUM_ADC 12
-struct ao_adc {
- uint16_t tick; /* tick when the sample was read */
- uint16_t adc[AO_TELESCIENCE_NUM_ADC]; /* samples */
-};
-
-#define AO_ADC_RING 16
-
#endif /* _AO_ARCH_H_ */
diff --git a/src/avr/ao_pins.h b/src/avr/ao_pins.h
index 6a63468f..f2b40fb4 100644
--- a/src/avr/ao_pins.h
+++ b/src/avr/ao_pins.h
@@ -21,7 +21,7 @@
#ifdef AVR_DEMO
#define AO_LED_RED (1<<7)
#define LEDS_AVAILABLE (AO_LED_RED)
- #define USE_SERIAL_STDIN 1
+ #define USE_SERIAL_1_STDIN 1
#define HAS_USB 1
#define PACKET_HAS_SLAVE 0
#define HAS_SERIAL_1 1
@@ -37,11 +37,11 @@
#define HAS_USB 1
#define HAS_LOG 1
#define TEENSY 0
- #define USE_SERIAL_STDIN 0
#define HAS_SERIAL_1 0
#define HAS_ADC 1
#define PACKET_HAS_SLAVE 0
#define HAS_BEEP 0
+ #define HAS_EEPROM 1
#define HAS_STORAGE_DEBUG 0
#define AVR_VCC_5V 0
@@ -66,7 +66,7 @@
#define HAS_USB 1
#define HAS_LOG 0
#define TEENSY 0
- #define USE_SERIAL_STDIN 1
+ #define USE_SERIAL_1_STDIN 1
#define HAS_SERIAL_1 1
#define HAS_USB 1
#define HAS_ADC 1
@@ -88,4 +88,13 @@
#define AO_M25_SPI_CS_PORT SPI_CS_PORT
#define AO_M25_SPI_CS_MASK M25_CS_MASK
+#define AO_TELESCIENCE_NUM_ADC 12
+
+struct ao_adc {
+ uint16_t tick; /* tick when the sample was read */
+ uint16_t adc[AO_TELESCIENCE_NUM_ADC]; /* samples */
+};
+
+#define AO_ADC_RING 16
+
#endif /* _AO_PINS_H_ */
diff --git a/src/avr/ao_serial_avr.c b/src/avr/ao_serial_avr.c
index 6885c339..dcee246c 100644
--- a/src/avr/ao_serial_avr.c
+++ b/src/avr/ao_serial_avr.c
@@ -17,8 +17,8 @@
#include "ao.h"
-__xdata struct ao_fifo ao_usart1_rx_fifo;
-__xdata struct ao_fifo ao_usart1_tx_fifo;
+__xdata struct ao_fifo ao_serial1_rx_fifo;
+__xdata struct ao_fifo ao_serial1_tx_fifo;
void
ao_debug_out(char c)
@@ -31,10 +31,10 @@ ao_debug_out(char c)
ISR(USART1_RX_vect)
{
- if (!ao_fifo_full(ao_usart1_rx_fifo))
- ao_fifo_insert(ao_usart1_rx_fifo, UDR1);
- ao_wakeup(&ao_usart1_rx_fifo);
-#if USE_SERIAL_STDIN
+ if (!ao_fifo_full(ao_serial1_rx_fifo))
+ ao_fifo_insert(ao_serial1_rx_fifo, UDR1);
+ ao_wakeup(&ao_serial1_rx_fifo);
+#if USE_SERIAL_1_STDIN
ao_wakeup(&ao_stdin_ready);
#endif
}
@@ -42,68 +42,68 @@ ISR(USART1_RX_vect)
static __xdata uint8_t ao_serial_tx1_started;
static void
-ao_serial_tx1_start(void)
+ao_serial1_tx_start(void)
{
- if (!ao_fifo_empty(ao_usart1_tx_fifo) &&
+ if (!ao_fifo_empty(ao_serial1_tx_fifo) &&
!ao_serial_tx1_started)
{
ao_serial_tx1_started = 1;
- ao_fifo_remove(ao_usart1_tx_fifo, UDR1);
+ ao_fifo_remove(ao_serial1_tx_fifo, UDR1);
}
}
ISR(USART1_UDRE_vect)
{
- ao_serial_tx1_started = 0;
- ao_serial_tx1_start();
- ao_wakeup(&ao_usart1_tx_fifo);
+ ao_serial1_tx_started = 0;
+ ao_serial1_tx_start();
+ ao_wakeup(&ao_serial1_tx_fifo);
}
char
-ao_serial_getchar(void) __critical
+ao_serial1_getchar(void) __critical
{
char c;
cli();
- while (ao_fifo_empty(ao_usart1_rx_fifo))
- ao_sleep(&ao_usart1_rx_fifo);
- ao_fifo_remove(ao_usart1_rx_fifo, c);
+ while (ao_fifo_empty(ao_serial1_rx_fifo))
+ ao_sleep(&ao_serial1_rx_fifo);
+ ao_fifo_remove(ao_serial1_rx_fifo, c);
sei();
return c;
}
-#if USE_SERIAL_STDIN
+#if USE_SERIAL_1_STDIN
char
-ao_serial_pollchar(void) __critical
+ao_serial1_pollchar(void) __critical
{
char c;
cli();
- if (ao_fifo_empty(ao_usart1_rx_fifo)) {
+ if (ao_fifo_empty(ao_serial1_rx_fifo)) {
sei();
return AO_READ_AGAIN;
}
- ao_fifo_remove(ao_usart1_rx_fifo,c);
+ ao_fifo_remove(ao_serial1_rx_fifo,c);
sei();
return c;
}
#endif
void
-ao_serial_putchar(char c) __critical
+ao_serial1_putchar(char c) __critical
{
cli();
- while (ao_fifo_full(ao_usart1_tx_fifo))
- ao_sleep(&ao_usart1_tx_fifo);
- ao_fifo_insert(ao_usart1_tx_fifo, c);
+ while (ao_fifo_full(ao_serial1_tx_fifo))
+ ao_sleep(&ao_serial1_tx_fifo);
+ ao_fifo_insert(ao_serial1_tx_fifo, c);
ao_serial_tx1_start();
sei();
}
void
-ao_serial_drain(void) __critical
+ao_serial1_drain(void) __critical
{
cli();
- while (!ao_fifo_empty(ao_usart1_tx_fifo))
- ao_sleep(&ao_usart1_tx_fifo);
+ while (!ao_fifo_empty(ao_serial1_tx_fifo))
+ ao_sleep(&ao_serial1_tx_fifo);
sei();
}
@@ -125,7 +125,7 @@ static const struct {
};
void
-ao_serial_set_speed(uint8_t speed)
+ao_serial1_set_speed(uint8_t speed)
{
ao_serial_drain();
if (speed > AO_SERIAL_SPEED_57600)
@@ -154,9 +154,9 @@ ao_serial_init(void)
(1 << TXEN1) | /* Enable transmitter */
(1 << RXCIE1) | /* Enable receive interrupts */
(1 << UDRIE1)); /* Enable transmit empty interrupts */
-#if USE_SERIAL_STDIN
- ao_add_stdio(ao_serial_pollchar,
- ao_serial_putchar,
+#if USE_SERIAL_1_STDIN
+ ao_add_stdio(ao_serial1_pollchar,
+ ao_serial1_putchar,
NULL);
#endif
}
diff --git a/src/avr/ao_usb.h b/src/avr/ao_usb.h
deleted file mode 100644
index 6633dafc..00000000
--- a/src/avr/ao_usb.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright © 2009 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#ifndef _AO_USB_H_
-#define _AO_USB_H_
-
-#define AO_USB_SETUP_DIR_MASK (0x01 << 7)
-#define AO_USB_SETUP_TYPE_MASK (0x03 << 5)
-#define AO_USB_SETUP_RECIP_MASK (0x1f)
-
-#define AO_USB_DIR_OUT 0
-#define AO_USB_DIR_IN (1 << 7)
-
-#define AO_USB_TYPE_STANDARD 0
-#define AO_USB_TYPE_CLASS (1 << 5)
-#define AO_USB_TYPE_VENDOR (2 << 5)
-#define AO_USB_TYPE_RESERVED (3 << 5)
-
-#define AO_USB_RECIP_DEVICE 0
-#define AO_USB_RECIP_INTERFACE 1
-#define AO_USB_RECIP_ENDPOINT 2
-#define AO_USB_RECIP_OTHER 3
-
-/* standard requests */
-#define AO_USB_REQ_GET_STATUS 0x00
-#define AO_USB_REQ_CLEAR_FEATURE 0x01
-#define AO_USB_REQ_SET_FEATURE 0x03
-#define AO_USB_REQ_SET_ADDRESS 0x05
-#define AO_USB_REQ_GET_DESCRIPTOR 0x06
-#define AO_USB_REQ_SET_DESCRIPTOR 0x07
-#define AO_USB_REQ_GET_CONFIGURATION 0x08
-#define AO_USB_REQ_SET_CONFIGURATION 0x09
-#define AO_USB_REQ_GET_INTERFACE 0x0A
-#define AO_USB_REQ_SET_INTERFACE 0x0B
-#define AO_USB_REQ_SYNCH_FRAME 0x0C
-
-#define AO_USB_DESC_DEVICE 1
-#define AO_USB_DESC_CONFIGURATION 2
-#define AO_USB_DESC_STRING 3
-#define AO_USB_DESC_INTERFACE 4
-#define AO_USB_DESC_ENDPOINT 5
-#define AO_USB_DESC_DEVICE_QUALIFIER 6
-#define AO_USB_DESC_OTHER_SPEED 7
-#define AO_USB_DESC_INTERFACE_POWER 8
-
-#define AO_USB_GET_DESC_TYPE(x) (((x)>>8)&0xFF)
-#define AO_USB_GET_DESC_INDEX(x) ((x)&0xFF)
-
-#define AO_USB_CONTROL_EP 0
-#define AO_USB_INT_EP 1
-#define AO_USB_OUT_EP 4
-#define AO_USB_IN_EP 5
-#define AO_USB_CONTROL_SIZE 32
-/*
- * Double buffer IN and OUT EPs, so each
- * gets half of the available space
- *
- * Ah, but USB bulk packets can only come in 8, 16, 32 and 64
- * byte sizes, so we'll use 64 for everything
- */
-#define AO_USB_IN_SIZE 64
-#define AO_USB_OUT_SIZE 64
-
-#define AO_USB_EP0_IDLE 0
-#define AO_USB_EP0_DATA_IN 1
-#define AO_USB_EP0_DATA_OUT 2
-
-#define LE_WORD(x) ((x)&0xFF),((uint8_t) (((uint16_t) (x))>>8))
-
-/* CDC definitions */
-#define CS_INTERFACE 0x24
-#define CS_ENDPOINT 0x25
-
-#define SET_LINE_CODING 0x20
-#define GET_LINE_CODING 0x21
-#define SET_CONTROL_LINE_STATE 0x22
-
-/* Data structure for GET_LINE_CODING / SET_LINE_CODING class requests */
-struct ao_usb_line_coding {
- uint32_t rate;
- uint8_t char_format;
- uint8_t parity;
- uint8_t data_bits;
-} ;
-
-#endif /* _AO_USB_H_ */
diff --git a/src/avr/ao_usb_avr.c b/src/avr/ao_usb_avr.c
index fc8899d8..23a27c73 100644
--- a/src/avr/ao_usb_avr.c
+++ b/src/avr/ao_usb_avr.c
@@ -330,17 +330,17 @@ ao_usb_ep0_setup(void)
case AO_USB_TYPE_CLASS:
debug ("Class setup packet\n");
switch (ao_usb_setup.request) {
- case SET_LINE_CODING:
+ case AO_USB_SET_LINE_CODING:
debug ("set line coding\n");
ao_usb_ep0_out_len = 7;
ao_usb_ep0_out_data = (__xdata uint8_t *) &ao_usb_line_coding;
break;
- case GET_LINE_CODING:
+ case AO_USB_GET_LINE_CODING:
debug ("get line coding\n");
ao_usb_ep0_in_len = 7;
ao_usb_ep0_in_data = (uint8_t *) &ao_usb_line_coding;
break;
- case SET_CONTROL_LINE_STATE:
+ case AO_USB_SET_CONTROL_LINE_STATE:
break;
}
break;
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-15 22:21:14 +0000