From 1083f59d248b41c19ff760a351bc192be8508aab Mon Sep 17 00:00:00 2001 From: Nélio Laranjeiro Date: Sun, 9 Mar 2008 21:14:15 +0100 Subject: Tested the init function. Tested the write (flash_write) Tested the read (flash_read) --- digital/avr/modules/flash/flash.c | 30 ++++++-- digital/avr/modules/flash/flash.h | 3 +- digital/avr/modules/flash/test/Makefile | 9 ++- digital/avr/modules/flash/test/test-erase.c | 74 +++++++++++++++++++ digital/avr/modules/flash/test/test-flash.c | 85 ---------------------- digital/avr/modules/flash/test/test-init.c | 69 ++++++++++++++++++ .../avr/modules/flash/test/test-write-anarray.c | 83 +++++++++++++++++++++ .../avr/modules/flash/test/test-write-onebyte.c | 67 +++++++++++++++++ 8 files changed, 325 insertions(+), 95 deletions(-) create mode 100644 digital/avr/modules/flash/test/test-erase.c delete mode 100644 digital/avr/modules/flash/test/test-flash.c create mode 100644 digital/avr/modules/flash/test/test-init.c create mode 100644 digital/avr/modules/flash/test/test-write-anarray.c create mode 100644 digital/avr/modules/flash/test/test-write-onebyte.c (limited to 'digital') diff --git a/digital/avr/modules/flash/flash.c b/digital/avr/modules/flash/flash.c index 326afb59..24526f26 100644 --- a/digital/avr/modules/flash/flash.c +++ b/digital/avr/modules/flash/flash.c @@ -59,6 +59,10 @@ flash_erase (uint8_t cmd, uint32_t start_addr) /* Send the start address */ flash_address (start_addr); } + else + { + flash_global.addr = 0x0; + } } /** Poll the busy bit in the Software Status Register of the flash memory. @@ -78,8 +82,9 @@ flash_is_busy (void) } /** Initialise the flsah memory. + * \return the flash context usefull to access to the addr for debug. */ -void +flash_t * flash_init (void) { uint8_t rsp[3]; @@ -127,23 +132,22 @@ flash_init (void) /* TODO: disable flash usage if no flash is found? */ /* Search for the next address to start writting. */ + for (addr = 0; (rsp[0] != 0xFF) && (addr < 0x200000); addr += FLASH_PAGE_SIZE - 1) { AC_FLASH_PORT &= ~_BV(AC_FLASH_BIT_SS); spi_send (FLASH_READ); - flash_address (flash_global.addr); + flash_address (addr); rsp[0] = spi_recv(); AC_FLASH_PORT |= _BV(AC_FLASH_BIT_SS); proto_send1b ('r',rsp[0]); } - flash_global.addr = addr - FLASH_PAGE_SIZE; + flash_global.addr = addr - FLASH_PAGE_SIZE + 1; - proto_send3b ('r',((flash_global.addr >> 16) & 0x1f), (flash_global.addr - >> 8), - flash_global.addr); + return &flash_global; } /* Send a flash command to the flash memory (only a command). @@ -209,6 +213,8 @@ flash_read_array (uint32_t addr, uint8_t *buffer, uint32_t length) for (i = 0; i < length; i++) { buffer[i] = spi_recv (); + /* Wait for the flash until it is busy */ + while (flash_is_busy()); } AC_FLASH_PORT |= _BV(AC_FLASH_BIT_SS); } @@ -224,14 +230,23 @@ flash_write_array (uint32_t addr, uint8_t *data, uint32_t length) { uint32_t i; + if (length < 2) + return; + AC_FLASH_PORT &= ~_BV(AC_FLASH_BIT_SS); spi_send (FLASH_AAI); /* send the start address */ flash_address (addr); + spi_send (data[0]); + spi_send (data[1]); AC_FLASH_PORT |= _BV(AC_FLASH_BIT_SS); + proto_send2b ('j', data[i], data[i+1]); + + /* Wait for the flash until it is busy */ + while (flash_is_busy()); /* Send two bytes */ - for (i = 0; i < length; i += 2) + for (i = 2; i < length; i += 2) { AC_FLASH_PORT &= ~_BV(AC_FLASH_BIT_SS); spi_send (FLASH_AAI); @@ -241,6 +256,7 @@ flash_write_array (uint32_t addr, uint8_t *data, uint32_t length) /* Wait for the flash until it is busy */ while (flash_is_busy()); + proto_send2b ('j', data[i], data[i+1]); } } diff --git a/digital/avr/modules/flash/flash.h b/digital/avr/modules/flash/flash.h index 8d72ba43..5ff4e8ce 100644 --- a/digital/avr/modules/flash/flash.h +++ b/digital/avr/modules/flash/flash.h @@ -59,8 +59,9 @@ struct flash_t typedef struct flash_t flash_t; /** Initialise the flsah memory. + * \return the flash context usefull to access to the addr for debug. */ -void +flash_t * flash_init (void); /** Flash access. diff --git a/digital/avr/modules/flash/test/Makefile b/digital/avr/modules/flash/test/Makefile index ff34bc7f..1ae64f7f 100644 --- a/digital/avr/modules/flash/test/Makefile +++ b/digital/avr/modules/flash/test/Makefile @@ -1,6 +1,11 @@ BASE = ../../.. -AVR_PROGS = test_flash -test_flash_SOURCES = test-flash.c +AVR_PROGS = test-write-onbyte test-erase test-write-anarray test-init + +test-write-onbyte_SOURCES = test-write-onebyte.c +test-erase_SOURCES = test-erase.c +test-write-anarray_SOURCES = test-write-anarray.c +test-init_SOURCES = test-init.c + MODULES = utils spi flash proto uart CONFIGFILE = avrconfig.h # atmega8, atmega8535, atmega128... diff --git a/digital/avr/modules/flash/test/test-erase.c b/digital/avr/modules/flash/test/test-erase.c new file mode 100644 index 00000000..3c4312e0 --- /dev/null +++ b/digital/avr/modules/flash/test/test-erase.c @@ -0,0 +1,74 @@ +/* test-erase.c */ +/* avr.flash - AVR Flash SPI use. {{{ + * + * 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 "common.h" +#include "io.h" +#include "../flash.h" +#include "modules/proto/proto.h" +#include "modules/utils/utils.h" +#include "modules/uart/uart.h" + +#define TEST_BASE 0x50 + +void +proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) +{ +#define c(cmd, size) (cmd << 8 | size) + switch (c (cmd, size)) + { + case c ('z', 0): + /* Reset */ + utils_reset (); + break; + default: + /* Error */ + proto_send0 ('?'); + return; + } + /* Acknowledge what has been done */ + proto_send (cmd, size, args); +} + +int +main (void) +{ + uart0_init (); + proto_send0 ('z'); + proto_send0 ('c'); + flash_init (); + proto_send0 ('f'); + + flash_erase (FLASH_ERASE_FULL, 0); + + while (flash_is_busy ()) + { + utils_delay_ms (10); + proto_send0 ('o'); + } + proto_send0 ('e'); + + while (1) + proto_accept (uart0_getc ()); +} + diff --git a/digital/avr/modules/flash/test/test-flash.c b/digital/avr/modules/flash/test/test-flash.c deleted file mode 100644 index ace1de8a..00000000 --- a/digital/avr/modules/flash/test/test-flash.c +++ /dev/null @@ -1,85 +0,0 @@ -/* 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 "common.h" -#include "io.h" -#include "../flash.h" -#include "modules/proto/proto.h" -#include "modules/utils/utils.h" -#include "modules/uart/uart.h" - -#define TEST_BASE 0x50 - -void -proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) -{ -#define c(cmd, size) (cmd << 8 | size) - switch (c (cmd, size)) - { - case c ('z', 0): - /* Reset */ - utils_reset (); - break; - default: - /* Error */ - proto_send0 ('?'); - return; - } - /* Acknowledge what has been done */ - proto_send (cmd, size, args); -} - -int -main (void) -{ - uint8_t data[26]; - uint8_t data_rsp[26]; - uint8_t i; - - uart0_init (); - proto_send0 ('z'); - proto_send0 ('c'); - flash_init (); - proto_send0 ('f'); - /*flash_write (TEST_BASE, 'a'); - proto_send1b ('o',flash_read(TEST_BASE)); -*/ - for (i = 0; i < 26; i++) - { - data[i] = i + 'a'; - } - - /* Write a full array. */ - flash_write_array (TEST_BASE + 1, data, 26); - - /* Read a full array. */ - flash_read_array (TEST_BASE + 1, data_rsp, 26); - - /* Print the data_rsp to the i2c */ - proto_send ('g', 26, data_rsp); - - while (1) - proto_accept (uart0_getc ()); -} - diff --git a/digital/avr/modules/flash/test/test-init.c b/digital/avr/modules/flash/test/test-init.c new file mode 100644 index 00000000..ef9e410d --- /dev/null +++ b/digital/avr/modules/flash/test/test-init.c @@ -0,0 +1,69 @@ +/* test-erase.c */ +/* avr.flash - AVR Flash SPI use. {{{ + * + * 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 "common.h" +#include "io.h" +#include "../flash.h" +#include "modules/proto/proto.h" +#include "modules/utils/utils.h" +#include "modules/uart/uart.h" + +#define FLASH_DEBUG 1 + +void +proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) +{ +#define c(cmd, size) (cmd << 8 | size) + switch (c (cmd, size)) + { + case c ('z', 0): + /* Reset */ + utils_reset (); + break; + default: + /* Error */ + proto_send0 ('?'); + return; + } + /* Acknowledge what has been done */ + proto_send (cmd, size, args); +} + +int +main (void) +{ + flash_t *flash; + + uart0_init (); + proto_send0 ('z'); + proto_send0 ('c'); + flash = flash_init (); + proto_send0 ('f'); + + proto_send3b ('e', (flash->addr >> 16) & 0x1f, (flash->addr >> 8), flash->addr); + + while (1) + proto_accept (uart0_getc ()); +} + diff --git a/digital/avr/modules/flash/test/test-write-anarray.c b/digital/avr/modules/flash/test/test-write-anarray.c new file mode 100644 index 00000000..52b7d529 --- /dev/null +++ b/digital/avr/modules/flash/test/test-write-anarray.c @@ -0,0 +1,83 @@ +/* test-write-anarray.c */ +/* avr.flash - AVR Flash SPI use. {{{ + * + * 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 "common.h" +#include "io.h" +#include "../flash.h" +#include "modules/proto/proto.h" +#include "modules/utils/utils.h" +#include "modules/uart/uart.h" + +#define TEST_BASE 0x38 + +void +proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) +{ +#define c(cmd, size) (cmd << 8 | size) + switch (c (cmd, size)) + { + case c ('z', 0): + /* Reset */ + utils_reset (); + break; + default: + /* Error */ + proto_send0 ('?'); + return; + } + /* Acknowledge what has been done */ + proto_send (cmd, size, args); +} + +int +main (void) +{ + uint8_t data[26]; + uint8_t data_rsp[26]; + uint8_t i; + + uart0_init (); + proto_send0 ('z'); + proto_send0 ('c'); + flash_init (); + proto_send0 ('f'); + + for (i = 0; i < 26; i++) + { + data[i] = i + 'a'; + } + + /* Write a full array. */ + flash_write_array (TEST_BASE , data, 26); + + /* Read a full array. */ + flash_read_array (TEST_BASE , data_rsp, 26); + + /* Print the data_rsp to the i2c */ + proto_send ('g', 26, data_rsp); + + while (1) + proto_accept (uart0_getc ()); +} + diff --git a/digital/avr/modules/flash/test/test-write-onebyte.c b/digital/avr/modules/flash/test/test-write-onebyte.c new file mode 100644 index 00000000..7ab5094c --- /dev/null +++ b/digital/avr/modules/flash/test/test-write-onebyte.c @@ -0,0 +1,67 @@ +/* test-write-onebyte.c */ +/* avr.flash - AVR Flash SPI use. {{{ + * + * 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 "common.h" +#include "io.h" +#include "../flash.h" +#include "modules/proto/proto.h" +#include "modules/utils/utils.h" +#include "modules/uart/uart.h" + +#define TEST_BASE 0x00 + +void +proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) +{ +#define c(cmd, size) (cmd << 8 | size) + switch (c (cmd, size)) + { + case c ('z', 0): + /* Reset */ + utils_reset (); + break; + default: + /* Error */ + proto_send0 ('?'); + return; + } + /* Acknowledge what has been done */ + proto_send (cmd, size, args); +} + +int +main (void) +{ + uart0_init (); + proto_send0 ('z'); + proto_send0 ('c'); + flash_init (); + proto_send0 ('f'); + flash_write (TEST_BASE, 'a'); + proto_send1b ('o',flash_read(TEST_BASE)); + + while (1) + proto_accept (uart0_getc ()); +} + -- cgit v1.2.3