TARGET/MIPS32_DMAACC: review scope of functions

[openocd] / src / target / arm7_9_common.c

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index c6a08cf1bfb87c1064cf6d2c19d08ff169e00487..8f63f3c0ae547cb24845720a1a0daf93a8061995 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -687,12 +687,11 @@ int arm7_9_execute_sys_speed(struct target *target)
        struct reg *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
 
        /* set RESTART instruction */
-       jtag_set_end_state(TAP_IDLE);
        if (arm7_9->need_bypass_before_restart) {
                arm7_9->need_bypass_before_restart = 0;
-               arm_jtag_set_instr(jtag_info, 0xf, NULL);
+               arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
        }
-       arm_jtag_set_instr(jtag_info, 0x4, NULL);
+       arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
 
        long long then = timeval_ms();
        int timeout;
@@ -740,12 +739,11 @@ int arm7_9_execute_fast_sys_speed(struct target *target)
        struct reg *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT];
 
        /* set RESTART instruction */
-       jtag_set_end_state(TAP_IDLE);
        if (arm7_9->need_bypass_before_restart) {
                arm7_9->need_bypass_before_restart = 0;
-               arm_jtag_set_instr(jtag_info, 0xf, NULL);
+               arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
        }
-       arm_jtag_set_instr(jtag_info, 0x4, NULL);
+       arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
 
        if (!set)
        {
@@ -995,7 +993,7 @@ int arm7_9_assert_reset(struct target *target)
                         * certain ARM9 cores (maybe more) - AT91SAM9260
                         * and STR9
                         */
-                       jtag_add_runtest(1, jtag_get_end_state());
+                       jtag_add_runtest(1, TAP_IDLE);
                }
                else
                {
@@ -1743,12 +1741,11 @@ int arm7_9_restart_core(struct target *target)
        struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
        /* set RESTART instruction */
-       jtag_set_end_state(TAP_IDLE);
        if (arm7_9->need_bypass_before_restart) {
                arm7_9->need_bypass_before_restart = 0;
-               arm_jtag_set_instr(jtag_info, 0xf, NULL);
+               arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
        }
-       arm_jtag_set_instr(jtag_info, 0x4, NULL);
+       arm_jtag_set_instr(jtag_info, 0x4, NULL, TAP_IDLE);
 
        jtag_add_runtest(1, TAP_IDLE);
        return jtag_execute_queue();