target: Remove read_memory_imp

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

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index e1c4c9c3f9f4dc913fe652736765ade590a321d8..3923b3d10d0ecec9ceaf9a26ca64e4840c692d26 100644 (file)
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -812,6 +812,7 @@ static int cortex_a8_poll(struct target *target)
                        LOG_DEBUG("Target halted");
                        target->state = TARGET_HALTED;
                        if ((prev_target_state == TARGET_RUNNING)
+                               || (prev_target_state == TARGET_UNKNOWN)
                                || (prev_target_state == TARGET_RESET)) {
                                retval = cortex_a8_debug_entry(target);
                                if (retval != ERROR_OK)
@@ -1397,13 +1398,13 @@ static int cortex_a8_set_breakpoint(struct target *target,
                        buf_set_u32(code, 0, 32, ARMV5_T_BKPT(0x11));
                else
                        buf_set_u32(code, 0, 32, ARMV5_BKPT(0x11));
-               retval = target->type->read_memory(target,
+               retval = target_read_memory(target,
                                breakpoint->address & 0xFFFFFFFE,
                                breakpoint->length, 1,
                                breakpoint->orig_instr);
                if (retval != ERROR_OK)
                        return retval;
-               retval = target->type->write_memory(target,
+               retval = target_write_memory(target,
                                breakpoint->address & 0xFFFFFFFE,
                                breakpoint->length, 1, code);
                if (retval != ERROR_OK)
@@ -1629,13 +1630,13 @@ static int cortex_a8_unset_breakpoint(struct target *target, struct breakpoint *
        } else {
                /* restore original instruction (kept in target endianness) */
                if (breakpoint->length == 4) {
-                       retval = target->type->write_memory(target,
+                       retval = target_write_memory(target,
                                        breakpoint->address & 0xFFFFFFFE,
                                        4, 1, breakpoint->orig_instr);
                        if (retval != ERROR_OK)
                                return retval;
                } else {
-                       retval = target->type->write_memory(target,
+                       retval = target_write_memory(target,
                                        breakpoint->address & 0xFFFFFFFE,
                                        2, 1, breakpoint->orig_instr);
                        if (retval != ERROR_OK)