From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Tue, 31 Jan 2012 10:39:55 +0000 (+0100)
Subject: Merge branch 'master' of github.com:UweBonnes/stlink
X-Git-Url: https://git.gag.com/?p=fw%2Fstlink;a=commitdiff_plain;h=9e842c3aa51780280120915722802356f605aff1;hp=-c

Merge branch 'master' of github.com:UweBonnes/stlink
---

9e842c3aa51780280120915722802356f605aff1
diff --combined flash/main.c
index 249e5fd,f838d92..2428745
--- a/flash/main.c
+++ b/flash/main.c
@@@ -126,17 -126,23 +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);
@@@ -148,12 -154,6 +154,12 @@@
    }
    else /* read */
    {
 +    if ((o.addr >= sl->flash_base) &&
 +	(o.addr < sl->flash_base + sl->flash_size))
 +        o.size = sl->flash_size;
 +    else if ((o.addr >= sl->sram_base) &&
 +	     (o.addr < sl->sram_base + sl->sram_size))
 +        o.size = sl->sram_size;
      err = stlink_fread(sl, o.filename, o.addr, o.size);
      if (err == -1)
      {