X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=flash%2Fmain.c;h=39910b63665ad388c658951ad43bf6db7639571b;hb=2edd0530a6d3dfc428bedc3d9628093775673389;hp=849b5d6cd47dda8d48f15e97983071b18c51346a;hpb=ed7464f235c889cbad6a953ee1ea64a99bf69304;p=fw%2Fstlink

diff --git a/flash/main.c b/flash/main.c
index 849b5d6..39910b6 100644
--- a/flash/main.c
+++ b/flash/main.c
@@ -23,6 +23,7 @@ static void usage(void)
 {
     puts("stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size>");
     puts("stlinkv2 command line: ./flash {read|write} path addr <size>");
+    puts("                       use hex format for addr and <size>");
 }
 
 static int get_opts(struct opts* o, int ac, char** av)
@@ -47,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, 10);
+    if (ac > 3)
+	o->size = strtoul(av[i + 3], NULL, 16);
   }
   else if (strcmp(av[0], "write") == 0)
   {
@@ -79,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");
@@ -88,13 +90,14 @@ int main(int ac, char** av)
 
   if (o.devname != NULL) /* stlinkv1 */
   {
-    static const int scsi_verbose = 2;
-    sl = stlink_v1_open(o.devname, scsi_verbose);
+    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;
 }