src: Add driver for AVR internal eeprom. Use for telepyro config.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/avr/ao_eeprom_avr.c b/src/avr/ao_eeprom_avr.c
new file mode 100644 (file)
index 0000000..2451fa8
--- /dev/null
+++ b/src/avr/ao_eeprom_avr.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ * Copyright © 2011  Anthony Towns <aj@erisian.com.au>
+ *
+ * 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.
+ */
+
+#include <ao.h>
+#include <ao_storage.h>
+
+/* Total bytes of available storage */
+__pdata ao_pos_t       ao_storage_total = 1024;
+
+/* Block size - device is erased in these units. */
+__pdata ao_pos_t       ao_storage_block = 1024;
+
+/* Byte offset of config block. Will be ao_storage_block bytes long */
+__pdata ao_pos_t       ao_storage_config = 0;
+
+/* Storage unit size - device reads and writes must be within blocks of this size. */
+__pdata uint16_t       ao_storage_unit = 1024;
+
+/*
+ * The internal flash chip is arranged in 8 byte sectors; the
+ * chip cannot erase in units smaller than that.
+ *
+ * Writing happens in units of 2 bytes and
+ * can only change bits from 1 to 0. So, you can rewrite
+ * the same contents, or append to an existing page easily enough
+ */
+
+/*
+ * Erase the specified sector
+ */
+uint8_t
+ao_storage_erase(ao_pos_t pos) __reentrant
+{
+       /* Not necessary */
+       return 1;
+}
+
+#define ao_intflash_wait_idle() do {                                   \
+               /* Wait for any outstanding writes to complete */       \
+               while (EECR & (1 << EEPE))                              \
+                       ;                                               \
+       } while (0)                                                     \
+
+static void
+ao_intflash_write(uint16_t pos, uint8_t d)
+{
+       ao_intflash_wait_idle();
+       EEAR = pos;
+       EEDR = d;
+       ao_arch_critical(
+               EECR |= (1 << EEMPE);
+               EECR |= (1 << EEPE);
+               );
+}
+
+static uint8_t
+ao_intflash_read(uint16_t pos)
+{
+       ao_intflash_wait_idle();
+       EEAR = pos;
+
+       EECR |= (1 << EERE);
+       return EEDR;
+}
+/*
+ * Write to flash
+ */
+
+uint8_t
+ao_storage_device_write(ao_pos_t pos32, __xdata void *v, uint16_t len) __reentrant
+{
+       uint16_t pos = pos32;
+       __xdata uint8_t *d = v;
+
+       if (pos >= ao_storage_total || pos + len > ao_storage_total)
+               return 0;
+
+       while (len--)
+               ao_intflash_write(pos++, *d++);
+
+       return 1;
+}
+
+/*
+ * Read from flash
+ */
+uint8_t
+ao_storage_device_read(ao_pos_t pos, __xdata void *v, uint16_t len) __reentrant
+{
+       uint8_t *d = v;
+       
+       if (pos >= ao_storage_total || pos + len > ao_storage_total)
+               return 0;
+       while (len--)
+               *d++ = ao_intflash_read(pos++);
+       return 1;
+}
+
+void
+ao_storage_flush(void) __reentrant
+{
+}
+
+void
+ao_storage_setup(void)
+{
+}
+
+void
+ao_storage_device_info(void) __reentrant
+{
+       printf ("Using internal flash\n");
+}
+
+void
+ao_storage_device_init(void)
+{
+}

diff --git a/src/avr/ao_pins.h b/src/avr/ao_pins.h
index 850a08ec8a1369fd36b3c6c655b2f2f5b5b1c3b7..3c9010a81cc90ddad86179ea1d8cc921947a913f 100644 (file)
--- a/src/avr/ao_pins.h
+++ b/src/avr/ao_pins.h
@@ -72,6 +72,12 @@
        #define HAS_ADC                 1
        #define PACKET_HAS_SLAVE        0
        #define HAS_BEEP                0
+       #define HAS_EEPROM              1
+       #define USE_INTERNAL_FLASH      1
+       #define DISABLE_HELP            1
+       #define HAS_STORAGE_DEBUG       0
+       #define IS_COMPANION            1
+       #define ao_storage_pos_t        uint16_t
 
        #define AVR_VCC_5V              0
        #define AVR_VCC_3V3             1

diff --git a/src/telepyro-v0.1/Makefile b/src/telepyro-v0.1/Makefile
index 2ac7e747c049de78c67ab2dba58763d1d2353af4..bc57b9d79e4458d1c592895f1f769d50d3993478 100644 (file)
--- a/src/telepyro-v0.1/Makefile
+++ b/src/telepyro-v0.1/Makefile
@@ -22,7 +22,8 @@ INC = \
        ao.h \
        ao_usb.h \
        ao_pins.h \
-       altitude.h
+       ao_arch.h \
+       ao_arch_funcs.h
 
 ALTOS_SRC = \
        ao_clock.c \
@@ -39,14 +40,18 @@ ALTOS_SRC = \
        ao_usb_avr.c \
        ao_adc_avr.c \
        ao_pyro_slave.c \
-       ao_spi_slave.c
+       ao_spi_slave.c \
+       ao_eeprom_avr.c \
+       ao_storage.c \
+       ao_config.c \
+       ao_pyro.c
 
 PRODUCT=TelePyro-v0.1
 MCU=atmega32u4
 PRODUCT_DEF=-DTELEPYRO
 IDPRODUCT=0x0011
 CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../core -I..
-CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR
+CFLAGS += -mmcu=$(MCU) -Wall -Wstrict-prototypes -O3 -mcall-prologues -DAVR
 
 NICKLE=nickle
 
@@ -79,9 +84,6 @@ $(PROG).hex: $(PROG)
 load: $(PROG).hex
        $(LOADCMD) $(LOADARG)$(PROG).hex
 
-../altitude.h: make-altitude
-       nickle $< > $@
-
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
 
@@ -100,4 +102,4 @@ install:
 
 uninstall:
 
-$(OBJ): ao.h ao_product.h ao_usb.h
+$(OBJ): $(INC)