svf: implement sleep for RUNTEST min_time

[openocd.git] / src / svf / svf.c

diff --git a/src/svf/svf.c b/src/svf/svf.c
index a015e3c435b31738032a7371659001d19a7acfd0..53994a2d13cc5294437078120fb6150f5f2afd7b 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -315,8 +315,6 @@ COMMAND_HANDLER(handle_svf_command)
 {
 #define SVF_MIN_NUM_OF_OPTIONS                 1
 #define SVF_MAX_NUM_OF_OPTIONS                 5
-#define USAGE [-tap device.tap] <file> [quiet] [progress]
-#define PRINT_USAGE    command_print(CMD_CTX, "svf USAGE")
        int command_num = 0;
        int ret = ERROR_OK;
        long long time_measure_ms;
@@ -330,8 +328,7 @@ COMMAND_HANDLER(handle_svf_command)
 
        if ((CMD_ARGC < SVF_MIN_NUM_OF_OPTIONS) || (CMD_ARGC > SVF_MAX_NUM_OF_OPTIONS))
        {
-               PRINT_USAGE;
-               return ERROR_FAIL;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        // parse command line
@@ -359,10 +356,9 @@ COMMAND_HANDLER(handle_svf_command)
                else if ((svf_fd = fopen(CMD_ARGV[i], "r")) == NULL)
                {
                        int err = errno;
-                       PRINT_USAGE;
                        command_print(CMD_CTX, "open(\"%s\"): %s", CMD_ARGV[i], strerror(err));
                        // no need to free anything now
-                       return ERROR_FAIL;
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                }
                else
                {
@@ -372,8 +368,7 @@ COMMAND_HANDLER(handle_svf_command)
 
        if (svf_fd == NULL)
        {
-               PRINT_USAGE;
-               return ERROR_FAIL;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        // get time
@@ -1483,47 +1478,45 @@ static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str)
                        }
                        i += 2;
                }
-               // calculate run_count
-               if ((0 == run_count) && (min_time > 0))
-               {
-                       run_count = min_time * svf_para.frequency;
-               }
+
                // all parameter should be parsed
                if (i == num_of_argu)
                {
-                       if (run_count > 0)
-                       {
-                               // run_state and end_state is checked to be stable state
-                               // TODO: do runtest
 #if 1
-                               /* FIXME handle statemove failures */
-                               int retval;
+                       /* FIXME handle statemove failures */
+                       int retval;
+                       uint32_t min_usec = 1000000 * min_time;
 
-                               // enter into run_state if necessary
-                               if (cmd_queue_cur_state != svf_para.runtest_run_state)
-                               {
-                                       retval = svf_add_statemove(svf_para.runtest_run_state);
-                               }
+                       // enter into run_state if necessary
+                       if (cmd_queue_cur_state != svf_para.runtest_run_state)
+                       {
+                               retval = svf_add_statemove(svf_para.runtest_run_state);
+                       }
 
-                               // call jtag_add_clocks
+                       // add clocks and/or min wait
+                       if (run_count > 0) {
                                jtag_add_clocks(run_count);
+                       }
 
-                               // move to end_state if necessary
-                               if (svf_para.runtest_end_state != svf_para.runtest_run_state)
-                               {
-                                       retval = svf_add_statemove(svf_para.runtest_end_state);
-                               }
+                       if (min_usec > 0) {
+                               jtag_add_sleep(min_usec);
+                       }
+
+                       // move to end_state if necessary
+                       if (svf_para.runtest_end_state != svf_para.runtest_run_state)
+                       {
+                               retval = svf_add_statemove(svf_para.runtest_end_state);
+                       }
 #else
-                               if (svf_para.runtest_run_state != TAP_IDLE)
-                               {
-                                       LOG_ERROR("cannot runtest in %s state",
-                                               tap_state_name(svf_para.runtest_run_state));
-                                       return ERROR_FAIL;
-                               }
+                       if (svf_para.runtest_run_state != TAP_IDLE)
+                       {
+                               LOG_ERROR("cannot runtest in %s state",
+                                       tap_state_name(svf_para.runtest_run_state));
+                               return ERROR_FAIL;
+                       }
 
-                               jtag_add_runtest(run_count, svf_para.runtest_end_state);
+                       jtag_add_runtest(run_count, svf_para.runtest_end_state);
 #endif
-                       }
                }
                else
                {
@@ -1712,7 +1705,7 @@ static const struct command_registration svf_command_handlers[] = {
                .handler = handle_svf_command,
                .mode = COMMAND_EXEC,
                .help = "Runs a SVF file.",
-               .usage = "USAGE",
+               .usage = "svf [-tap device.tap] <file> [quiet] [progress]",
        },
        COMMAND_REGISTRATION_DONE
 };