JLink support for non-7-cycle state moves by Dick Hollenbeck <dick@softplc.com>

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

diff --git a/src/svf/svf.c b/src/svf/svf.c
index c94461cabcab9ced807dcbb9f3511583a730f610..1267755b9b2d8d024c4c72339b8386b1640990a0 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -33,22 +33,9 @@
 #endif
 
 #include "svf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <sys/time.h>
-#include <time.h>
 
 // SVF command
 typedef enum
@@ -708,9 +695,8 @@ static int svf_execute_tap(void)
 }
 
 // not good to use this
-extern jtag_command_t** jtag_get_last_command_p(void);
 extern void* cmd_queue_alloc(size_t size);
-extern jtag_command_t **last_comand_pointer;
+extern void jtag_queue_command(jtag_command_t * cmd);
 
 static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
 {
@@ -720,9 +706,6 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
        // tmp variable
        int i_tmp;
 
-       // not good to use this
-       jtag_command_t **last_cmd;
-
        // for RUNTEST
        int run_count;
        float min_time, max_time;
@@ -985,7 +968,7 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
                        
                        
-                       field.in_handler = NULL;
+                       
                        
                        jtag_add_plain_dr_scan(1, &field, svf_para.dr_end_state);
 
@@ -1086,7 +1069,7 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        field.in_value = &svf_tdi_buffer[svf_buffer_index];
                        
                        
-                       field.in_handler = NULL;
+                       
                        
                        jtag_add_plain_ir_scan(1, &field, svf_para.ir_end_state);
 
@@ -1193,15 +1176,15 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                                // enter into run_state if necessary
                                if (last_state != svf_para.runtest_run_state)
                                {
-                                       last_cmd = jtag_get_last_command_p();
-                                       *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-                                       last_comand_pointer = &((*last_cmd)->next);
-                                       (*last_cmd)->next = NULL;
-                                       (*last_cmd)->type = JTAG_STATEMOVE;
-                                       (*last_cmd)->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
-                                       (*last_cmd)->cmd.statemove->end_state = svf_para.runtest_run_state;
-
-                                       cmd_queue_end_state = cmd_queue_cur_state = (*last_cmd)->cmd.statemove->end_state;
+                                       jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+                                       
+                                       jtag_queue_command(cmd);
+                               
+                                       cmd->type = JTAG_STATEMOVE;
+                                       cmd->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
+                                       cmd->cmd.statemove->end_state = svf_para.runtest_run_state;
+
+                                       cmd_queue_end_state = cmd_queue_cur_state = cmd->cmd.statemove->end_state;
                                }
 
                                // call jtag_add_clocks
@@ -1210,15 +1193,14 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                                if (svf_para.runtest_end_state != svf_para.runtest_run_state)
                                {
                                        // move to end_state
-                                       last_cmd = jtag_get_last_command_p();
-                                       *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-                                       last_comand_pointer = &((*last_cmd)->next);
-                                       (*last_cmd)->next = NULL;
-                                       (*last_cmd)->type = JTAG_STATEMOVE;
-                                       (*last_cmd)->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
-                                       (*last_cmd)->cmd.statemove->end_state = svf_para.runtest_end_state;
-
-                                       cmd_queue_end_state = cmd_queue_cur_state = (*last_cmd)->cmd.statemove->end_state;
+                                       jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+                                       
+                                       jtag_queue_command(cmd);
+                                       cmd->type = JTAG_STATEMOVE;
+                                       cmd->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
+                                       cmd->cmd.statemove->end_state = svf_para.runtest_end_state;
+
+                                       cmd_queue_end_state = cmd_queue_cur_state = cmd->cmd.statemove->end_state;
                                }
                                last_state = svf_para.runtest_end_state;
 #else
@@ -1307,15 +1289,15 @@ static int svf_run_command(struct command_context_s *cmd_ctx, char *cmd_str)
                        if (svf_tap_state_is_stable(state))
                        {
                                // TODO: move to state
-                               last_cmd = jtag_get_last_command_p();
-                               *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-                               last_comand_pointer = &((*last_cmd)->next);
-                               (*last_cmd)->next = NULL;
-                               (*last_cmd)->type = JTAG_STATEMOVE;
-                               (*last_cmd)->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
-                               (*last_cmd)->cmd.statemove->end_state = state;
-
-                               cmd_queue_end_state = cmd_queue_cur_state = (*last_cmd)->cmd.statemove->end_state;
+                               jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+                                       
+                               jtag_queue_command(cmd);
+                               
+                               cmd->type = JTAG_STATEMOVE;
+                               cmd->cmd.statemove = cmd_queue_alloc(sizeof(statemove_command_t));
+                               cmd->cmd.statemove->end_state = state;
+
+                               cmd_queue_end_state = cmd_queue_cur_state = cmd->cmd.statemove->end_state;
                                last_state = state;
 
                                LOG_DEBUG("\tmove to %s by state_move", svf_tap_state_name[state]);