X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=flash%2Fmain.c;h=609a6f7d3b7b549afe2953077656d3535ed7dfb3;hb=5eda4566d617fedd2a9d3020ddae06b394d08a5f;hp=791b0730b90dee0c0f906184601d59edc6db758d;hpb=ffe5d1f31a80c6d889fed923e8c374a1aa079176;p=fw%2Fstlink

diff --git a/flash/main.c b/flash/main.c
index 791b073..609a6f7 100644
--- 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,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)
 {
@@ -40,15 +48,15 @@ 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)
   {
     o->do_read = 0;
 
     /* stlinkv1 mode */
-    if (ac == 5)
+    if (ac == 4)
     {
       o->devname = av[1];
       i = 1;
@@ -72,31 +80,38 @@ 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");
+    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(50);
+    if (sl == NULL) goto on_error;
+    sl->verbose = 50;
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(NULL, 10);
+    sl = stlink_open_usb(50);
+    if (sl == NULL) goto on_error;
+    sl->verbose = 50;
   }
 
-  if (sl == NULL) goto on_error;
+  if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
+    stlink_exit_dfu_mode(sl);
 
-  if (o.do_read == 0) /* write */
-  {
-    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);
 
+  stlink_reset(sl);
+  stlink_load_device_params(sl);
+
+  if (o.do_read == 0) /* write */
+  {
     err = stlink_fwrite_flash(sl, o.filename, o.addr);
     if (err == -1)
     {
@@ -118,7 +133,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;
 }