From f8a7810ee62c0c41070da8f84e7e087d67dd6610 Mon Sep 17 00:00:00 2001 From: Nélio Laranjeiro Date: Mon, 23 Feb 2009 21:02:49 +0100 Subject: digital/avr/modules/flash: Added a function to send commands to dump the memory. --- digital/avr/modules/flash/flash.c | 36 +++++++++++++++ digital/avr/modules/flash/flash.h | 15 +++++++ digital/avr/modules/flash/test/flash-dump.c | 69 +++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 digital/avr/modules/flash/test/flash-dump.c (limited to 'digital') diff --git a/digital/avr/modules/flash/flash.c b/digital/avr/modules/flash/flash.c index 4c528421..2a4b2493 100644 --- a/digital/avr/modules/flash/flash.c +++ b/digital/avr/modules/flash/flash.c @@ -237,3 +237,39 @@ flash_write_array (uint32_t addr, uint8_t *data, uint32_t length) } } +uint8_t +flash_log (uint8_t size, uint8_t *args) +{ + uint8_t buf[128]; + uint8_t status = 0x0; + uint32_t addr; + + if (size >= 4) + addr = (((uint32_t) args[1]) << 16) + | (((uint32_t) args[2]) << 8) | args[3]; + + switch (args[0]) + { + case FLASH_CMD_INIT: + status = flash_init (); + break; + case FLASH_CMD_READ: + if ((size == 5) + && (args[4] < sizeof(buf))) + { + flash_read_array (addr, buf, args[4]); + proto_send ('r', args[4], buf); + status = 0x1; + } + else if (size == 4) + { + proto_send1b ('r', flash_read (addr)); + status = 0x1; + } + break; + default: + status = 0x0; + } + + return status; +} diff --git a/digital/avr/modules/flash/flash.h b/digital/avr/modules/flash/flash.h index 0468ebdc..47cc882e 100644 --- a/digital/avr/modules/flash/flash.h +++ b/digital/avr/modules/flash/flash.h @@ -53,6 +53,13 @@ #define FLASH_TBP_US 10 +enum +{ + FLASH_CMD_INIT, + FLASH_CMD_READ, + FLASH_CMD_NB +}; + /** Flash access. * The flash contains an address of 21 bits in a range from 0x0-0x1fffff. * This function shall access the memory directly by the SPI. @@ -141,4 +148,12 @@ flash_read_array (uint32_t addr, uint8_t *buffer, uint32_t length); void flash_write_array (uint32_t addr, uint8_t *data, uint32_t length); +/** Process the logs + * \param size the number of arguments. + * \param an array of arguments. + * \return true on success. + */ +uint8_t +flash_log (uint8_t size, uint8_t *args); + #endif /* flash_h */ diff --git a/digital/avr/modules/flash/test/flash-dump.c b/digital/avr/modules/flash/test/flash-dump.c new file mode 100644 index 00000000..c2bc6106 --- /dev/null +++ b/digital/avr/modules/flash/test/flash-dump.c @@ -0,0 +1,69 @@ +/* flash-dump.c */ +/* avr.flash - AVR Flash SPI use. {{{ + * + * Copyright (C) 2009 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 "modules/flash/flash.h" +#include "modules/proto/proto.h" +#include "modules/utils/utils.h" +#include "modules/utils/byte.h" +#include "modules/uart/uart.h" + +void +proto_callback (uint8_t cmd, uint8_t size, uint8_t *args) +{ + /* May be unused. */ + uint32_t addr = v8_to_v32 (0, args[0], args[1], args[2]); + uint8_t status; +#define c(cmd, size) (cmd << 8 | size) + switch (c (cmd, size)) + { + case c ('z', 0): + /* Reset */ + utils_reset (); + break; + default: + if (cmd == 'l') + status = flash_log (size, args); + if (!status) + /* Error */ + proto_send0('?'); + else + /* Error */ + proto_send0 ('?'); + return; + } + /* Acknowledge what has been done */ + proto_send (cmd, size, args); +} + +int +main (void) +{ + uart0_init (); + + while (1) + proto_accept (uart0_getc ()); +} + -- cgit v1.2.3