From 31e3ea7c19d39589ac9a8b2220331206b6d1e25c Mon Sep 17 00:00:00 2001 From: David Brownell Date: Fri, 4 Dec 2009 19:14:48 -0800 Subject: ARM: rename ARMV4_5_STATE_* as ARM_STATE_* Signed-off-by: David Brownell --- src/target/cortex_a8.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/target/cortex_a8.c') diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c index eb42a5d5..57e4bcdf 100644 --- a/src/target/cortex_a8.c +++ b/src/target/cortex_a8.c @@ -705,17 +705,17 @@ static int cortex_a8_resume(struct target *target, int current, */ switch (armv4_5->core_state) { - case ARMV4_5_STATE_ARM: + case ARM_STATE_ARM: resume_pc &= 0xFFFFFFFC; break; - case ARMV4_5_STATE_THUMB: + case ARM_STATE_THUMB: case ARM_STATE_THUMB_EE: /* When the return address is loaded into PC * bit 0 must be 1 to stay in Thumb state */ resume_pc |= 0x1; break; - case ARMV4_5_STATE_JAZELLE: + case ARM_STATE_JAZELLE: LOG_ERROR("How do I resume into Jazelle state??"); return ERROR_FAIL; } @@ -974,7 +974,7 @@ static int cortex_a8_step(struct target *target, int current, uint32_t address, /* Setup single step breakpoint */ stepbreakpoint.address = address; - stepbreakpoint.length = (armv4_5->core_state == ARMV4_5_STATE_THUMB) + stepbreakpoint.length = (armv4_5->core_state == ARM_STATE_THUMB) ? 2 : 4; stepbreakpoint.type = BKPT_HARD; stepbreakpoint.set = 0; -- cgit v1.2.3-18-g5258