jtag: remove jtag_get_end_state()'s that should be unecessary

By a bit of code inspection it seems like all of these
instances of jtag_get_end_state() can be unambigously
replaced by constants.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 177d286d8be976e359f2f400de51b08b743687d4..9b8b48043dae52d088bbe5cecd7255728517ea37 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -849,7 +849,7 @@ void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer,
                }
        } else
        {
                }
        } else
        {

-               tap_state_t end_state = jtag_get_end_state();
+               tap_state_t end_state = TAP_IDLE;

                tap_state_t shift_end_state;
                if (post_bits == 0)
                        shift_end_state = end_state;
                tap_state_t shift_end_state;
                if (post_bits == 0)
                        shift_end_state = end_state;

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 85c68163affe3998c9f4e29aeac18573db3f4ef2..4c8d83d66461f37b0f741fefca9fb61c8306c903 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -995,7 +995,7 @@ int arm7_9_assert_reset(struct target *target)
                         * certain ARM9 cores (maybe more) - AT91SAM9260
                         * and STR9
                         */
                         * certain ARM9 cores (maybe more) - AT91SAM9260
                         * and STR9
                         */

-                       jtag_add_runtest(1, jtag_get_end_state());
+                       jtag_add_runtest(1, TAP_IDLE);

                }
                else
                {
                }
                else
                {

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 25151ff4b9a94d0f8cd72a7bf785c29a484e716c..f14527510f1f83b8e0af1454933d87b7ef991ae9 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -104,9 +104,9 @@ static __inline int arm7tdmi_clock_out_inner(struct arm_jtag *jtag_info, uint32_
                        2,
                        arm7tdmi_num_bits,
                        values,
                        2,
                        arm7tdmi_num_bits,
                        values,

-                       jtag_get_end_state());
+                       TAP_DRPAUSE);

 
 

-       jtag_add_runtest(0, jtag_get_end_state());
+       jtag_add_runtest(0, TAP_DRPAUSE);

 
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index b4b6f04a5621d31f87c5e0954224c6f99b6aaf0f..4f28599a525e8f988551ebd940ed4b37b3bb6cc2 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -186,7 +186,7 @@ int arm9tdmi_clock_out(struct arm_jtag *jtag_info, uint32_t instr,
                jtag_add_dr_scan(jtag_info->tap, 3, fields, TAP_DRPAUSE);
        }
 
                jtag_add_dr_scan(jtag_info->tap, 3, fields, TAP_DRPAUSE);
        }
 

-       jtag_add_runtest(0, jtag_get_end_state());
+       jtag_add_runtest(0, TAP_DRPAUSE);

 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
        {
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
        {

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index cd48ce69713f457475d9e7f070afd4c07bf940f3..d2781152732bec3012ec6e31b443fcd2397280e9 100644 (file)
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -128,7 +128,7 @@ static __inline__ void embeddedice_write_reg_inner(struct jtag_tap *tap, int reg
                        2,
                        embeddedice_num_bits,
                        values,
                        2,
                        embeddedice_num_bits,
                        values,

-                       jtag_get_end_state());
+                       TAP_IDLE);

 }
 
 void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count);
 }
 
 void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count);