Changed size argument to hex

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 0fd7232b9916d58c1bed823b48ed70e004afa289..f1d0b4f845d0cd90f62ab313624c2cb60156621e 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -17,6 +17,12 @@ struct opts
   size_t size;
 };
 
+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)
 {
@@ -41,7 +47,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)
   {
@@ -75,18 +81,24 @@ int main(int ac, char** av)
   if (get_opts(&o, ac - 1, av + 1) == -1)
   {
     printf("invalid command line\n");
+    usage();
     goto on_error;
   }
 
   if (o.devname != NULL) /* stlinkv1 */
   {
+#if CONFIG_USE_LIBSG
     static const int scsi_verbose = 2;
     sl = stlink_quirk_open(o.devname, scsi_verbose);
     if (sl == NULL) goto on_error;
+#else
+    printf("not compiled for use with STLink/V1");
+    goto on_error;
+#endif
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(10);
+    sl = stlink_open_usb(1);
     if (sl == NULL) goto on_error;
   }