[update] apply patches from marpe@mimuw.edu.pl for flash tool: verbosity, run after...

diff --git a/AUTHORS b/AUTHORS
index 105e25b6b9748fa9e23d7df545dfdae2720976bb..f60ebcaa2e118c2689f308a2e604e7735359fc80 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,4 +11,5 @@ nelsonjm@macpod.neta
 ned@bike-nomad.com
 csamuelson@swingpal.com
 bravikov@gmail.com
-jnosky - codegrinder69@hotmail.com
\ No newline at end of file
+jnosky - codegrinder69@hotmail.com
+marpe@mimuw.edu.pl

diff --git a/flash/main.c b/flash/main.c
index 5637489236c7785c806efbebbcc9e2f9e90bda6d..8781941cc780a4074917e9685d5ec8ab6ede2a77 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -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,12 +90,14 @@ int main(int ac, char** av)
 
   if (o.devname != NULL) /* stlinkv1 */
   {
-    sl = stlink_v1_open(100);
+    sl = stlink_v1_open(50);
+    sl->verbose = 50;
     if (sl == NULL) goto on_error;
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(100);
+    sl = stlink_open_usb(50);
+    sl->verbose = 50;
     if (sl == NULL) goto on_error;
   }
 
@@ -129,7 +132,12 @@ int main(int ac, char** av)
   err = 0;
 
  on_error:
-  if (sl != NULL) stlink_close(sl);
+  if (sl != NULL)
+  {
+    stlink_reset(sl);
+    stlink_run(sl);
+    stlink_close(sl);
+  }
 
   return err;
 }