Rename jtag_add_end_state to jtag_set_end_state since "add" implies that

[fw/openocd] / src / target / arm920t.c

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index af26a2fca998cb5b19ffe06f5074a8467c46d32e..049e5d184891927ca5d9e5afce72c2cf65a1782c 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -22,12 +22,9 @@
 #endif
 
 #include "arm920t.h"
-#include "jtag.h"
-#include "log.h"
 #include "time_support.h"
+#include "target_type.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
@@ -106,7 +103,7 @@ int arm920t_read_cp15_physical(target_t *target, int reg_addr, u32 *value)
        u8 reg_addr_buf = reg_addr & 0x3f;
        u8 nr_w_buf = 0;
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
        arm_jtag_scann(jtag_info, 0xf);
        arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -130,14 +127,13 @@ int arm920t_read_cp15_physical(target_t *target, int reg_addr, u32 *value)
        fields[3].out_value = &nr_w_buf;
        fields[3].in_value = NULL;
 
-       jtag_add_dr_scan(4, fields, TAP_INVALID);
+       jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
-       u8 tmp[4];
-       fields[1].in_value = tmp;
+       fields[1].in_value = (u8 *)value;
 
-       jtag_add_dr_scan_now(4, fields, TAP_INVALID);
+       jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
-       *value=le_to_h_u32(tmp);
+       jtag_add_callback(arm_le_to_h_u32, (u8 *)value);
 
        #ifdef _DEBUG_INSTRUCTION_EXECUTION_
        jtag_execute_queue();
@@ -160,7 +156,7 @@ int arm920t_write_cp15_physical(target_t *target, int reg_addr, u32 value)
 
        buf_set_u32(value_buf, 0, 32, value);
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
        arm_jtag_scann(jtag_info, 0xf);
        arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -184,7 +180,7 @@ int arm920t_write_cp15_physical(target_t *target, int reg_addr, u32 value)
        fields[3].out_value = &nr_w_buf;
        fields[3].in_value = NULL;
 
-       jtag_add_dr_scan(4, fields, TAP_INVALID);
+       jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
        LOG_DEBUG("addr: 0x%x value: %8.8x", reg_addr, value);
@@ -205,7 +201,7 @@ int arm920t_execute_cp15(target_t *target, u32 cp15_opcode, u32 arm_opcode)
        u8 nr_w_buf = 0;
        u8 cp15_opcode_buf[4];
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
        arm_jtag_scann(jtag_info, 0xf);
        arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL);
 
@@ -231,7 +227,7 @@ int arm920t_execute_cp15(target_t *target, u32 cp15_opcode, u32 arm_opcode)
        fields[3].out_value = &nr_w_buf;
        fields[3].in_value = NULL;
 
-       jtag_add_dr_scan(4, fields, TAP_INVALID);
+       jtag_add_dr_scan(4, fields, jtag_get_end_state());
 
        arm9tdmi_clock_out(jtag_info, arm_opcode, 0, NULL, 0);
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 1);