From edea824055ff395a218a1968c1efefd3dc9d6a37 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Sun, 29 Jan 2012 14:21:26 +0100 Subject: [PATCH] Give a different error when writing to flash or ram --- flash/main.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/flash/main.c b/flash/main.c index 249e5fd..2428745 100644 --- 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) && - (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); - 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); - 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); -- 2.30.2