use tap_get_tms_path_len() instead of fix # of 7. Not tested if this builds, but...

git-svn-id: svn://svn.berlios.de/openocd/trunk@1833 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index 0c00cace76a44f5d5d5bff00fb17d81154923bbd..f883d5dd091eb4cef4626e7d2d521c5891b05f96 100644 (file)
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -333,8 +333,9 @@ static void armjtagew_state_move(void)
        int i;
        int 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;
                armjtagew_tap_append_step(tms, 0);

diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index af17b63892a0bdb7869229672572288e4854a2ca..b196ffc05ceced3ad0734fb861ac74bcea9c33e6 100644 (file)
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -161,8 +161,9 @@ void bitq_state_move(tap_state_t new_state)
        }
 
        tms_scan = tap_get_tms_path(tap_get_state(), new_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++)
        {
                bitq_io(tms_scan & 1, 0, 0);
                tms_scan >>= 1;

diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index d8502d9f18c67347486ed4686663055bf588507a..c6acacab86cb727ca1c74575ebf8a864741a069d 100644 (file)
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -197,10 +197,11 @@ static void gw16012_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());
 
        gw16012_control(0x0); /* single-bit mode */
 
-       for (i = 0; i < 7; i++)
+       for (i = 0; i < tms_count; i++)
        {
                tms = (tms_scan >> i) & 1;
                gw16012_data(tms << 1); /* output next TMS bit */

diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c
index 77cab9b9ee3857c9a979b6944659e21056db890a..934a8896b9896555e7238988e81c09040cfd5dac 100644 (file)
--- a/src/jtag/rlink/rlink.c
+++ b/src/jtag/rlink/rlink.c
@@ -916,8 +916,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);

diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c
index 7e4b9986ebcb37a1308dcef9a770c024687bfbe2..2794e175effa46627b753fa170222a528cf3f59b 100644 (file)
--- a/src/jtag/usbprog.c
+++ b/src/jtag/usbprog.c
@@ -247,9 +247,10 @@ static void usbprog_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());
 
        usbprog_jtag_write_tms(usbprog_jtag_handle, (char)tms_scan);
-       for (i = 0; i < 7; i++)
+       for (i = 0; i < tms_count; i++)
        {
                tms = (tms_scan >> i) & 1;
        }

diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index 2a43d01d6c98f3bd1ff6d7151470d6ec7e0e0835..1e684c15a730a1a2f63fe0751b80396093538815 100644 (file)
--- a/src/jtag/zy1000.c
+++ b/src/jtag/zy1000.c
@@ -686,8 +686,9 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
        /* test manual drive code on any target */
        int tms;
        u8 tms_scan = tap_get_tms_path(t, 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;
                waitIdle();