summaryrefslogtreecommitdiff
path: root/digital/avr
diff options
context:
space:
mode:
authorNélio Laranjeiro2010-05-11 01:12:53 +0200
committerNélio Laranjeiro2010-05-11 01:12:53 +0200
commit6cd47a860152dcf7aeb536f2cc0fb835fba4d9f8 (patch)
treeb594ea1c78830d87117f7db323418106633ae50d /digital/avr
parent3dd8938e57b84228ee9fff72c54bba7657526c27 (diff)
digital/avr/modules/{flash, trace}: fix erase full command and error use
* flash SST was not able to erase all the flash * test-trace was handle the error value with the wrong values
Diffstat (limited to 'digital/avr')
-rw-r--r--digital/avr/modules/flash/flash_sst.avr.c2
-rw-r--r--digital/avr/modules/trace/test/test-trace.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/digital/avr/modules/flash/flash_sst.avr.c b/digital/avr/modules/flash/flash_sst.avr.c
index 5f0a63ec..68fb1a5e 100644
--- a/digital/avr/modules/flash/flash_sst.avr.c
+++ b/digital/avr/modules/flash/flash_sst.avr.c
@@ -82,7 +82,7 @@ flash_sst_erase (flash_erase_cmd_t cmd, uint32_t start_addr)
sst_cmd = FLASH_SST_ERASE_64K;
break;
default:
- return;
+ sst_cmd = FLASH_SST_ERASE_FULL;
}
flash_sst_send_command (FLASH_SST_CMD_WREN);
FLASH_CS_ENABLE;
diff --git a/digital/avr/modules/trace/test/test-trace.c b/digital/avr/modules/trace/test/test-trace.c
index 49f4199f..0a0a1cf0 100644
--- a/digital/avr/modules/trace/test/test-trace.c
+++ b/digital/avr/modules/trace/test/test-trace.c
@@ -145,7 +145,7 @@ proto_callback (uint8_t cmd, uint8_t size, uint8_t *args)
{
error = flash_log (size, args);
}
- else if (error || (cmd != 'l'))
+ else if (!error || (cmd != 'l'))
{
/* Error */
proto_send0 ('?');