Merge branch 'tmaster' into future

[fw/stlink] / flash / main.c

diff --git a/flash/main.c b/flash/main.c
index f1d0b4f845d0cd90f62ab313624c2cb60156621e..5637489236c7785c806efbebbcc9e2f9e90bda6d 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>
@@ -87,18 +89,12 @@ int main(int ac, char** av)
 
   if (o.devname != NULL) /* stlinkv1 */
   {
-#if CONFIG_USE_LIBSG
-    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;
-#else
-    printf("not compiled for use with STLink/V1");
-    goto on_error;
-#endif
   }
   else /* stlinkv2 */
   {
-    sl = stlink_open_usb(1);
+    sl = stlink_open_usb(100);
     if (sl == NULL) goto on_error;
   }