diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 19:14:48 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 19:14:48 -0800 |
| commit | 31e3ea7c19d39589ac9a8b2220331206b6d1e25c (patch) | |
| tree | aeab882174f1d49a589b93f366ee13f5e3c500bc /src/target/cortex_a8.c | |
| parent | f67f6fe5bb8a466cc4d49f83608f026c4b233949 (diff) | |
| download | openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.tar.gz openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.tar.bz2 openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.tar.xz openocd+libswd-31e3ea7c19d39589ac9a8b2220331206b6d1e25c.zip | |
ARM: rename ARMV4_5_STATE_* as ARM_STATE_*
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/cortex_a8.c')
| -rw-r--r-- | src/target/cortex_a8.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |