diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-05-03 16:24:11 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-05-14 09:29:02 +0000 |
| commit | d2d4f776d8e24e8e651d1c896c90c15c38633172 (patch) | |
| tree | 8baaeea83650200d12ae9c16c9cfd1c718af186e /src/flash/nor/lpc2000.c | |
| parent | e1e1d4742c4f75603e177a3dc4338a7e265bbabb (diff) | |
build: use generic name for arm_algorithm vars
This makes the code a bit easier to read as arm_algorithm can
refer to other arch's, not just armv4_5.
Change-Id: I78c99d40f34cda04e06f2daee75b48ff40a1d23d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/613
Tested-by: jenkins
Reviewed-by: Aurelien Jacobs <aurel@gnuage.org>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Diffstat (limited to 'src/flash/nor/lpc2000.c')
| -rw-r--r-- | src/flash/nor/lpc2000.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 04b5bfd1..f3d8f9e9 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -272,7 +272,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, struct target *target = bank->target; struct mem_param mem_params[2]; struct reg_param reg_params[5]; - struct arm_algorithm armv4_5_info; /* for LPC2000 */ + struct arm_algorithm arm_algo; /* for LPC2000 */ struct armv7m_algorithm armv7m_info; /* for LPC1700 */ uint32_t status_code; uint32_t iap_entry_point = 0; /* to make compiler happier */ @@ -322,9 +322,9 @@ static int lpc2000_iap_call(struct flash_bank *bank, break; case lpc2000_v1: case lpc2000_v2: - armv4_5_info.common_magic = ARM_COMMON_MAGIC; - armv4_5_info.core_mode = ARM_MODE_SVC; - armv4_5_info.core_state = ARM_STATE_ARM; + arm_algo.common_magic = ARM_COMMON_MAGIC; + arm_algo.core_mode = ARM_MODE_SVC; + arm_algo.core_state = ARM_STATE_ARM; iap_entry_point = 0x7ffffff1; break; default: @@ -389,7 +389,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, target_run_algorithm(target, 2, mem_params, 5, reg_params, lpc2000_info->iap_working_area->address, lpc2000_info->iap_working_area->address + 0x4, - 10000, &armv4_5_info); + 10000, &arm_algo); break; default: LOG_ERROR("BUG: unknown lpc2000->variant encountered"); |