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/str9x.c | |
| parent | e1e1d4742c4f75603e177a3dc4338a7e265bbabb (diff) | |
| download | riscv-openocd-d2d4f776d8e24e8e651d1c896c90c15c38633172.zip riscv-openocd-d2d4f776d8e24e8e651d1c896c90c15c38633172.tar.gz riscv-openocd-d2d4f776d8e24e8e651d1c896c90c15c38633172.tar.bz2 | |
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/str9x.c')
| -rw-r--r-- | src/flash/nor/str9x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c index 472f922..ea8c35e 100644 --- a/src/flash/nor/str9x.c +++ b/src/flash/nor/str9x.c @@ -358,7 +358,7 @@ static int str9x_write_block(struct flash_bank *bank, struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[4]; - struct arm_algorithm armv4_5_info; + struct arm_algorithm arm_algo; int retval = ERROR_OK; /* see contib/loaders/flash/str9x.s for src */ @@ -413,9 +413,9 @@ static int str9x_write_block(struct flash_bank *bank, } } - 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; init_reg_param(®_params[0], "r0", 32, PARAM_OUT); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); @@ -433,7 +433,7 @@ static int str9x_write_block(struct flash_bank *bank, retval = target_run_algorithm(target, 0, NULL, 4, reg_params, str9x_info->write_algorithm->address, - 0, 10000, &armv4_5_info); + 0, 10000, &arm_algo); if (retval != ERROR_OK) { LOG_ERROR("error executing str9x flash write algorithm"); retval = ERROR_FLASH_OPERATION_FAILED; |