summaryrefslogtreecommitdiff
path: root/digital/avr/modules/flash
diff options
context:
space:
mode:
authorNélio Laranjeiro2008-02-24 19:47:16 +0100
committerNélio Laranjeiro2008-02-24 19:47:16 +0100
commit0ffaacc9df86e26e5323a973d99601721d767913 (patch)
treee224799c4720e4a2531ece0e3fc7419dcf2db106 /digital/avr/modules/flash
parent3ef9fbd44ae0cd089c0237663734cf4c5cc826b9 (diff)
Added sources for the flash use. Not tested !
Diffstat (limited to 'digital/avr/modules/flash')
-rw-r--r--digital/avr/modules/flash/Makefile5
-rw-r--r--digital/avr/modules/flash/Makefile.module1
-rw-r--r--digital/avr/modules/flash/README25
-rw-r--r--digital/avr/modules/flash/flash.c16
-rw-r--r--digital/avr/modules/flash/flash.h2
-rw-r--r--digital/avr/modules/flash/test/Makefile17
-rw-r--r--digital/avr/modules/flash/test/avrconfig.h86
-rw-r--r--digital/avr/modules/flash/test/test-flash.c39
8 files changed, 188 insertions, 3 deletions
diff --git a/digital/avr/modules/flash/Makefile b/digital/avr/modules/flash/Makefile
new file mode 100644
index 00000000..fa689635
--- /dev/null
+++ b/digital/avr/modules/flash/Makefile
@@ -0,0 +1,5 @@
+BASE = ../..
+DOC = spi.html
+EXTRACTDOC = spi.h spi.c
+
+include $(BASE)/make/Makefile.gen
diff --git a/digital/avr/modules/flash/Makefile.module b/digital/avr/modules/flash/Makefile.module
new file mode 100644
index 00000000..210dcb85
--- /dev/null
+++ b/digital/avr/modules/flash/Makefile.module
@@ -0,0 +1 @@
+flash_SOURCES=flash.c
diff --git a/digital/avr/modules/flash/README b/digital/avr/modules/flash/README
new file mode 100644
index 00000000..150c7910
--- /dev/null
+++ b/digital/avr/modules/flash/README
@@ -0,0 +1,25 @@
+avr.flash - AVR Flash SPI use.
+
+Function to allow the communication between the AVR and a flash memory using
+the SPI bus.
+
+
+Copyright (C) 2008 Nélio Laranjeiro
+
+APBTeam:
+ Web: http://apbteam.org/
+ Email: team AT apbteam DOT org
+
+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; either version 2 of the License, or
+(at your option) any later version.
+
+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.
diff --git a/digital/avr/modules/flash/flash.c b/digital/avr/modules/flash/flash.c
index 113a18a5..ae35501e 100644
--- a/digital/avr/modules/flash/flash.c
+++ b/digital/avr/modules/flash/flash.c
@@ -23,7 +23,7 @@
*
* }}} */
#include "flash.h"
-#include "spi.h"
+#include "modules/spi/spi.h"
static flash_t flash_global;
@@ -58,7 +58,7 @@ flash_read (uint8_t addr)
spi_init (SPI_IT_DISABLE | SPI_ENABLE | SPI_MSB_FIRST | SPI_MASTER |
SPI_CPOL_RISING | SPI_CPHA_SAMPLE | SPI_FOSC_DIV2);
spi_send (addr);
- return spi_recv (data);
+ return spi_recv ();
}
/** Read a data from the flash memory from the address provided and for a
@@ -84,7 +84,16 @@ flash_write_array (uint8_t addr, uint8_t *data, uint8_t length);
* \return data read from the memory.
*/
uint8_t
-flash_read_managed (uint8_t offset);
+flash_read_managed (uint8_t offset)
+{
+ if ((int8_t) flash_global.addr - (int8_t) offset < 0)
+ {
+ // Shall not happen.
+ // TODO Assert this.
+ }
+
+ return flash_read (flash_global.addr - offset);
+}
/** Read an array of data from the memory starting at the address less the
* offset provided in parameters. The data read will be stored in the buffer
@@ -99,6 +108,7 @@ flash_read_managed_array (uint8_t offset, uint8_t *buffer);
/** Write a data with a managed array.
* \param data to store in the memory.
*/
+void
flash_write_managed (uint8_t data);
/** Write an array of data to the flash memory. The length of the array shall
diff --git a/digital/avr/modules/flash/flash.h b/digital/avr/modules/flash/flash.h
index b70a8cd9..f5360c00 100644
--- a/digital/avr/modules/flash/flash.h
+++ b/digital/avr/modules/flash/flash.h
@@ -24,6 +24,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
+#include "io.h"
struct flash_t
{
@@ -89,6 +90,7 @@ flash_read_managed_array (uint8_t offset, uint8_t *buffer);
/** Write a data with a managed array.
* \param data to store in the memory.
*/
+void
flash_write_managed (uint8_t data);
/** Write an array of data to the flash memory. The length of the array shall
diff --git a/digital/avr/modules/flash/test/Makefile b/digital/avr/modules/flash/test/Makefile
new file mode 100644
index 00000000..38fa6706
--- /dev/null
+++ b/digital/avr/modules/flash/test/Makefile
@@ -0,0 +1,17 @@
+BASE = ../../..
+PROGS = test_flash
+test_flash_SOURCES = test-flash.c
+MODULES = utils spi flash
+CONFIGFILE = avrconfig.h
+# atmega8, atmega8535, atmega128...
+AVR_MCU = atmega8
+# -O2 : speed
+# -Os : size
+OPTIMIZE = -O2
+
+# Test compilations.
+#TEST_MCU = atmega8 atmega8535 atmega128
+#TEST_CONFIGFILES = avrconfig_ring.h avrconfig_polling.h avrconfig_twoports.h
+#avrconfig_twoports_TEST_MCU = atmega128
+
+include $(BASE)/make/Makefile.gen
diff --git a/digital/avr/modules/flash/test/avrconfig.h b/digital/avr/modules/flash/test/avrconfig.h
new file mode 100644
index 00000000..ac0b3b3a
--- /dev/null
+++ b/digital/avr/modules/flash/test/avrconfig.h
@@ -0,0 +1,86 @@
+#ifndef avrconfig_h
+#define avrconfig_h
+/* avrconfig.h */
+/* avr.spi - SPI AVR module. {{{
+ *
+ * Copyright (C) 2008 Nélio Laranjeiro
+ *
+ * APBTeam:
+ * Web: http://apbteam.org/
+ * Email: team AT apbteam DOT org
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * }}} */
+
+/* global */
+/** AVR Frequency : 1000000, 1843200, 2000000, 3686400, 4000000, 7372800,
+ * 8000000, 11059200, 14745600, 16000000, 18432000, 20000000. */
+#define AC_FREQ 14745600
+
+/* uart - UART module. */
+/** Select hardware uart for primary uart: 0, 1 or -1 to disable. */
+#define AC_UART0_PORT 0
+/** Baudrate: 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 76800,
+ * 115200, 230400, 250000, 500000, 1000000. */
+#define AC_UART0_BAUDRATE 115200
+/** Send mode:
+ * - POLLING: no interrupts.
+ * - RING: interrupts, ring buffer. */
+#define AC_UART0_SEND_MODE RING
+/** Recv mode, same as send mode. */
+#define AC_UART0_RECV_MODE RING
+/** Character size: 5, 6, 7, 8, 9 (only 8 implemented). */
+#define AC_UART0_CHAR_SIZE 8
+/** Parity : ODD, EVEN, NONE. */
+#define AC_UART0_PARITY EVEN
+/** Stop bits : 1, 2. */
+#define AC_UART0_STOP_BITS 1
+/** Send buffer size, should be power of 2 for RING mode. */
+#define AC_UART0_SEND_BUFFER_SIZE 32
+/** Recv buffer size, should be power of 2 for RING mode. */
+#define AC_UART0_RECV_BUFFER_SIZE 32
+/** If the send buffer is full when putc:
+ * - DROP: drop the new byte.
+ * - WAIT: wait until there is room in the send buffer. */
+#define AC_UART0_SEND_BUFFER_FULL WAIT
+/** In HOST compilation:
+ * - STDIO: use stdin/out.
+ * - PTS: use pseudo terminal. */
+#define AC_UART0_HOST_DRIVER STDIO
+/** Same thing for secondary port. */
+#define AC_UART1_PORT -1
+#define AC_UART1_BAUDRATE 115200
+#define AC_UART1_SEND_MODE RING
+#define AC_UART1_RECV_MODE RING
+#define AC_UART1_CHAR_SIZE 8
+#define AC_UART1_PARITY EVEN
+#define AC_UART1_STOP_BITS 1
+#define AC_UART1_SEND_BUFFER_SIZE 32
+#define AC_UART1_RECV_BUFFER_SIZE 32
+#define AC_UART1_SEND_BUFFER_FULL WAIT
+#define AC_UART1_HOST_DRIVER PTS
+
+/* proto - Protocol module. */
+/** Maximum argument size. */
+#define AC_PROTO_ARGS_MAX_SIZE 8
+/** Callback function name. */
+#define AC_PROTO_CALLBACK proto_callback
+/** Putchar function name. */
+#define AC_PROTO_PUTC uart0_putc
+/** Support for quote parameter. */
+#define AC_PROTO_QUOTE 1
+
+#endif /* avrconfig_h */
diff --git a/digital/avr/modules/flash/test/test-flash.c b/digital/avr/modules/flash/test/test-flash.c
new file mode 100644
index 00000000..d5e13089
--- /dev/null
+++ b/digital/avr/modules/flash/test/test-flash.c
@@ -0,0 +1,39 @@
+/* test-flash.c */
+/* {{{
+ *
+ * Copyright (C) 2008 Nélio Laranjeiro
+ *
+ * APBTeam:
+ * Web: http://apbteam.org/
+ * Email: team AT apbteam DOT org
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 "io.h"
+#include "../flash.h"
+
+int
+main (void)
+{
+ uint8_t data;
+
+ flash_init ();
+ flash_write (0x0, 0x14);
+ data = flash_read (0x0);
+ data = flash_read_managed (1);
+ return 1;
+}
+