Update tutorial docs and flash writing/reading

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index 5fb6f1c97f902687250d4f238258749fd373d893..44157816e9084b93359b3ae19bcba82725cafbfd 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -1,5 +1,7 @@
 /* simple wrapper around the stlink_flash_write function */
 
+// TODO - this should be done as just a simple flag to the st-util command line...
+
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,6 +19,11 @@ 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>");
+}
 
 static int get_opts(struct opts* o, int ac, char** av)
 {
@@ -75,25 +82,27 @@ 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 */
   {
-    static const int scsi_verbose = 2;
-    sl = stlink_quirk_open(o.devname, scsi_verbose);
+    sl = stlink_v1_open(100);
     if (sl == NULL) goto on_error;
-
-    if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
-      stlink_exit_dfu_mode(sl);
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(NULL, 10);
+    sl = stlink_open_usb(100);
     if (sl == NULL) goto on_error;
   }
 
-  stlink_enter_swd_mode(sl);
+  if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
+    stlink_exit_dfu_mode(sl);
+
+  if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
+    stlink_enter_swd_mode(sl);
+
   stlink_reset(sl);
 
   if (o.do_read == 0) /* write */