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

diff --git a/flash/main.c b/flash/main.c
index c8b15e0..609a6f7 100644
--- a/flash/main.c
+++ b/flash/main.c
@@ -1,51 +1,144 @@
 /* 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>
+#include <string.h>
+#include <sys/types.h>
 #include "stlink-common.h"
 
 
-int main(int ac, char** av)
+struct opts
 {
-  /* stlinkv1 command line: ./flash /dev/sgX path addr */
-  /* stlinkv2 command line: ./flash path addr */
-
-  stlink_t* sl = NULL;
+  unsigned int do_read;
+  const char* devname;
+  const char* filename;
   stm32_addr_t addr;
-  const char* path;
-  int err;
+  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)
+{
+  /* stlinkv1 command line: ./flash {read|write} /dev/sgX path addr <size> */
+  /* stlinkv2 command line: ./flash {read|write} path addr <size> */
+
+  unsigned int i = 0;
 
-  if (ac == 4) /* stlinkv1 */
+  if (ac < 3) return -1;
+
+  /* stlinkv2 */
+  o->devname = NULL;
+
+  if (strcmp(av[0], "read") == 0)
   {
-    static const int scsi_verbose = 2;
-    sl = stlink_quirk_open(av[1], scsi_verbose);
-    path = av[2];
-    addr = strtoul(av[3], NULL, 16);
+    o->do_read = 1;
+
+    /* stlinkv1 mode */
+    if (ac == 5)
+    {
+      o->devname = av[1];
+      i = 1;
+    }
+    if (ac > 3)
+	o->size = strtoul(av[i + 3], NULL, 16);
   }
-  else if (ac == 3) /* stlinkv2 */
+  else if (strcmp(av[0], "write") == 0)
   {
-    sl = stlink_open_usb(NULL, 10);
-    path = av[1];
-    addr = strtoul(av[2], NULL, 16);
+    o->do_read = 0;
+
+    /* stlinkv1 mode */
+    if (ac == 4)
+    {
+      o->devname = av[1];
+      i = 1;
+    }
   }
-  else /* invalid */
+  else
+  {
+    return -1;
+  }
+
+  o->filename = av[i + 1];
+  o->addr = strtoul(av[i + 2], NULL, 16);
+
+  return 0;
+} 
+
+
+int main(int ac, char** av)
+{
+  stlink_t* sl = NULL;
+  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 (sl == NULL) goto on_error;
+  if (o.devname != NULL) /* stlinkv1 */
+  {
+    sl = stlink_v1_open(50);
+    if (sl == NULL) goto on_error;
+    sl->verbose = 50;
+  }
+  else /* stlinkv2 */
+  {
+    sl = stlink_open_usb(50);
+    if (sl == NULL) goto on_error;
+    sl->verbose = 50;
+  }
+
+  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_load_device_params(sl);
 
-  err = stlink_fwrite_flash(sl, path, addr);
-  if (err == -1)
+  if (o.do_read == 0) /* write */
   {
-    printf("stlink_fwrite_flash() == -1\n");
-    goto on_error;
+    err = stlink_fwrite_flash(sl, o.filename, o.addr);
+    if (err == -1)
+    {
+      printf("stlink_fwrite_flash() == -1\n");
+      goto on_error;
+    }
   }
+  else /* read */
+  {
+    err = stlink_fread(sl, o.filename, o.addr, o.size);
+    if (err == -1)
+    {
+      printf("stlink_fread() == -1\n");
+      goto on_error;
+    }
+  }
+
+  /* success */
+  err = 0;
 
  on_error:
-  if (sl != NULL) stlink_close(sl);
+  if (sl != NULL)
+  {
+    stlink_reset(sl);
+    stlink_run(sl);
+    stlink_close(sl);
+  }
 
   return err;
 }