X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=flash%2Fmain.c;h=d61b22bd06f424978482b83e3ebfe2f07d69cc3b;hb=adaf602a5600ee53836d30f77a636ca380bfddf4;hp=5637489236c7785c806efbebbcc9e2f9e90bda6d;hpb=83a5eb2ed34ed78edacd92a69f366b89728ac5d0;p=fw%2Fstlink

diff --git a/flash/main.c b/flash/main.c
index 5637489..d61b22b 100644
--- a/flash/main.c
+++ b/flash/main.c
@@ -48,8 +48,8 @@ static int get_opts(struct opts* o, int ac, char** av)
       o->devname = av[1];
       i = 1;
     }
-
-    o->size = strtoul(av[i + 3], NULL, 16);
+    if (ac > 3)
+	o->size = strtoul(av[i + 3], NULL, 16);
   }
   else if (strcmp(av[0], "write") == 0)
   {
@@ -80,6 +80,7 @@ int main(int ac, char** av)
   struct opts o;
   int err = -1;
 
+  o.size = 0;
   if (get_opts(&o, ac - 1, av + 1) == -1)
   {
     printf("invalid command line\n");
@@ -89,13 +90,15 @@ int main(int ac, char** av)
 
   if (o.devname != NULL) /* stlinkv1 */
   {
-    sl = stlink_v1_open(100);
+    sl = stlink_v1_open(50);
     if (sl == NULL) goto on_error;
+    sl->verbose = 50;
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(100);
+    sl = stlink_open_usb(50);
     if (sl == NULL) goto on_error;
+    sl->verbose = 50;
   }
 
   if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
@@ -104,8 +107,6 @@ int main(int ac, char** av)
   if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
     stlink_enter_swd_mode(sl);
 
-  stlink_reset(sl);
-
   if (o.do_read == 0) /* write */
   {
     err = stlink_fwrite_flash(sl, o.filename, o.addr);
@@ -129,7 +130,11 @@ int main(int ac, char** av)
   err = 0;
 
  on_error:
-  if (sl != NULL) stlink_close(sl);
+  if (sl != NULL)
+  {
+    stlink_exit_debug_mode(sl);
+    stlink_close(sl);
+  }
 
   return err;
 }