Encapsulate jtag_reset_config using accessors:

[openocd.git] / src / jtag / rlink / rlink.c

diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c
index 683a1545d08d1a48df403ee77b69116df2a95325..554cca29311bfdb278ea7c2681ab06a48370d412 100644 (file)
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/rlink/rlink.c
@@ -28,7 +28,8 @@
 #endif
 
 /* project specific includes */
-#include "jtag.h"
+#include "interface.h"
+#include "commands.h"
 #include "rlink.h"
 #include "st7.h"
 #include "ep1_cmd.h"
@@ -517,7 +518,7 @@ dtc_run_download(
 
 
        /* Wait for DTC to finish running command buffer */
-       for(i = 5;;) {
+       for(i = 10;;) {
                usb_err = ep1_generic_commandl(
                        pHDev, 4,
 
@@ -916,8 +917,9 @@ void rlink_state_move(void) {
 
        int i=0, tms=0;
        u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
+       int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
-       for (i = 0; i < 7; i++)
+       for (i = 0; i < tms_count; i++)
        {
                tms = (tms_scan >> i) & 1;
                tap_state_queue_append(tms);
@@ -1094,7 +1096,7 @@ rlink_scan(
        u8                      *buffer,
        int                     scan_size
 ) {
-       int                     ir_scan;
+       bool            ir_scan;
        tap_state_t     saved_end_state;
        int                     byte_bits;
        int                     extra_bits;
@@ -1398,7 +1400,6 @@ int rlink_execute_queue(void)
        {
                switch (cmd->type)
                {
-                       case JTAG_END_STATE:
                        case JTAG_RUNTEST:
                        case JTAG_STATEMOVE:
                        case JTAG_PATHMOVE:
@@ -1414,18 +1415,11 @@ int rlink_execute_queue(void)
 
                switch (cmd->type)
                {
-                       case JTAG_END_STATE:
-#ifdef _DEBUG_JTAG_IO_
-                               LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state);
-#endif
-                               if (cmd->cmd.end_state->end_state != -1)
-                                       rlink_end_state(cmd->cmd.end_state->end_state);
-                               break;
                        case JTAG_RESET:
 #ifdef _DEBUG_JTAG_IO_
                                LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
 #endif
-                               if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
+                               if ((cmd->cmd.reset->trst == 1) || (cmd->cmd.reset->srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
                                {
                                        tap_set_state(TAP_RESET);
                                }
@@ -1855,7 +1849,7 @@ int rlink_init(void)
 
        tap_state_queue_init();
        dtc_queue_init();
-       rlink_speed(jtag_speed);
+       rlink_speed(jtag_get_speed());
        rlink_reset(0, 0);
 
        return ERROR_OK;