Merge branch 'master' into killsg

[fw/stlink] / src / test_sg.c

diff --git a/src/test_sg.c b/src/test_sg.c
index 34fbe540caa000c2665a87582b7578487b2f1816..30f867a1f415ea9053580049d4a5d4ebffea91dd 100644 (file)
--- a/src/test_sg.c
+++ b/src/test_sg.c
@@ -6,15 +6,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if CONFIG_USE_LIBSG
-#include <scsi/sg_lib.h>
-#include <scsi/sg_pt.h>
-#endif
 #include "stlink-common.h"
 
 int main(int argc, char *argv[]) {
        // set scpi lib debug level: 0 for no debug info, 10 for lots
-       const int scsi_verbose = 2;
        char *dev_name;
 
        switch (argc) {
@@ -37,11 +32,7 @@ int main(int argc, char *argv[]) {
                return EXIT_FAILURE;
        }
 
-       fputs("*** stlink access test ***\n", stderr);
-       fprintf(stderr, "Using sg_lib %s : scsi_pt %s\n", sg_lib_version(),
-               scsi_pt_version());
-
-       stlink_t *sl = stlink_quirk_open(dev_name, scsi_verbose);
+       stlink_t *sl = stlink_v1_open(dev_name, 10);
        if (sl == NULL)
                return EXIT_FAILURE;
 
@@ -176,7 +167,7 @@ int main(int argc, char *argv[]) {
        stlink_force_debug(sl);
        stlink_status(sl);
 #endif
-#if 1 /* read the system bootloader */
+#if 0 /* read the system bootloader */
        fputs("\n++++++++++ reading bootloader ++++++++++++++++\n\n", stderr);
        stlink_fread(sl, "/tmp/barfoo", sl->sys_base, sl->sys_size);
 #endif
@@ -202,6 +193,7 @@ int main(int argc, char *argv[]) {
        stlink_run_at(sl, sl->sram_base);
 #endif
 
+#if 0
        stlink_run(sl);
        stlink_status(sl);
        //----------------------------------------------------------------------
@@ -209,6 +201,7 @@ int main(int argc, char *argv[]) {
        stlink_exit_debug_mode(sl);
        stlink_current_mode(sl);
        stlink_close(sl);
+#endif
 
        //fflush(stderr); fflush(stdout);
        return EXIT_SUCCESS;