Merge pull request #29 from karlp/future_f1plusf4

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index a74525a5a300f87354b1b51812393093582bb6af..5637489236c7785c806efbebbcc9e2f9e90bda6d 100644 (file)
--- 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)
@@ -48,7 +49,7 @@ static int get_opts(struct opts* o, int ac, char** av)
       i = 1;
     }
 
-    o->size = strtoul(av[i + 3], NULL, 10);
+    o->size = strtoul(av[i + 3], NULL, 16);
   }
   else if (strcmp(av[0], "write") == 0)
   {
@@ -88,13 +89,12 @@ 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(100);
     if (sl == NULL) goto on_error;
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(10);
+    sl = stlink_open_usb(100);
     if (sl == NULL) goto on_error;
   }