arm_adi_v5: Remove all mem_ap_sel_* functions

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

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index fbfa170369e7514bf3d4ae7dd1365a4b810ad84f..b1579bca514cbae6724d03644936621db5ecb942 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -96,7 +96,7 @@ static int arm920t_read_cp15_physical(struct target *target,
        retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
-       retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->intest_instr, NULL, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
 
@@ -151,7 +151,7 @@ static int arm920t_write_cp15_physical(struct target *target,
        retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
-       retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->intest_instr, NULL, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
 
@@ -204,7 +204,7 @@ static int arm920t_execute_cp15(struct target *target, uint32_t cp15_opcode,
        retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
-       retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->intest_instr, NULL, TAP_IDLE);
        if (retval != ERROR_OK)
                return retval;
 
@@ -823,6 +823,7 @@ static int arm920t_init_arch_info(struct target *target,
 
        arm7_9->post_debug_entry = arm920t_post_debug_entry;
        arm7_9->pre_restore_context = arm920t_pre_restore_context;
+       arm7_9->write_memory = arm920t_write_memory;
 
        arm920t->armv4_5_mmu.armv4_5_cache.ctype = -1;
        arm920t->armv4_5_mmu.get_ttb = arm920t_get_ttb;