projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give a different error when writing to flash or ram
[fw/stlink]
/
flash
/
main.c
diff --git
a/flash/main.c
b/flash/main.c
index 249e5fddc016d3b74867cf4d8e941bf7d067ca30..24287456b41e283abc6624711267532b4de83fd9 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-126,17
+126,23
@@
int main(int ac, char** av)
if (o.cmd == DO_WRITE) /* write */
{
if ((o.addr >= sl->flash_base) &&
if (o.cmd == DO_WRITE) /* write */
{
if ((o.addr >= sl->flash_base) &&
- (o.addr < sl->flash_base + sl->flash_size))
+ (o.addr < sl->flash_base + sl->flash_size))
{
err = stlink_fwrite_flash(sl, o.filename, o.addr);
err = stlink_fwrite_flash(sl, o.filename, o.addr);
- else if ((o.addr >= sl->sram_base) &&
+ if (err == -1)
+ {
+ printf("stlink_fwrite_flash() == -1\n");
+ goto on_error;
+ }
+ }
+ else if ((o.addr >= sl->sram_base) &&
(o.addr < sl->sram_base + sl->sram_size))
err = stlink_fwrite_sram(sl, o.filename, o.addr);
(o.addr < sl->sram_base + sl->sram_size))
err = stlink_fwrite_sram(sl, o.filename, o.addr);
- if (err == -1)
- {
-
printf("stlink_fwrite
_flash() == -1\n");
- goto on_error;
- }
- }
+
if (err == -1)
+
{
+
printf("stlink_sram
_flash() == -1\n");
+
goto on_error;
+
}
+
}
else if (o.cmd == DO_ERASE)
{
err = stlink_erase_flash_mass(sl);
else if (o.cmd == DO_ERASE)
{
err = stlink_erase_flash_mass(sl);