diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2012-09-30 23:01:51 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-10-08 10:25:15 +0000 |
| commit | 4da4e1cfb7d93dcedc333c11c787b83b8baf7dfa (patch) | |
| tree | e19fc859bab81a52e7c52c9b8c502e10ef89bbcf /src/flash/nor/em357.c | |
| parent | 9fe0457c5167062cae1ff13b5aa6e10116eec537 (diff) | |
flash/nor: make all working area pointers local
Working area pointers shouldn't be re-used, so there's no point in storing
them in the flash bank struct. Make all such pointers local.
Change-Id: Iab65b4e8b475fed7fc72fb8928f54590fa69d260
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/865
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/flash/nor/em357.c')
| -rw-r--r-- | src/flash/nor/em357.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/flash/nor/em357.c b/src/flash/nor/em357.c index 412c9def..5fa00139 100644 --- a/src/flash/nor/em357.c +++ b/src/flash/nor/em357.c @@ -88,7 +88,6 @@ struct em357_options { struct em357_flash_bank { struct em357_options option_bytes; - struct working_area *write_algorithm; int ppage_size; int probed; }; @@ -107,7 +106,6 @@ FLASH_BANK_COMMAND_HANDLER(em357_flash_bank_command) em357_info = malloc(sizeof(struct em357_flash_bank)); bank->driver_priv = em357_info; - em357_info->write_algorithm = NULL; em357_info->probed = 0; return ERROR_OK; @@ -457,9 +455,9 @@ static int em357_protect(struct flash_bank *bank, int set, int first, int last) static int em357_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - struct em357_flash_bank *em357_info = bank->driver_priv; struct target *target = bank->target; uint32_t buffer_size = 16384; + struct working_area *write_algorithm; struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[4]; @@ -497,13 +495,13 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer, /* flash write code */ if (target_alloc_working_area(target, sizeof(em357_flash_write_code), - &em357_info->write_algorithm) != ERROR_OK) { + &write_algorithm) != ERROR_OK) { LOG_WARNING("no working area available, can't do block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } ; - retval = target_write_buffer(target, em357_info->write_algorithm->address, + retval = target_write_buffer(target, write_algorithm->address, sizeof(em357_flash_write_code), (uint8_t *)em357_flash_write_code); if (retval != ERROR_OK) return retval; @@ -512,10 +510,9 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer, while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) { buffer_size /= 2; if (buffer_size <= 256) { - /* if we already allocated the writing code, but failed to get a + /* we already allocated the writing code, but failed to get a * buffer, free the algorithm */ - if (em357_info->write_algorithm) - target_free_working_area(target, em357_info->write_algorithm); + target_free_working_area(target, write_algorithm); LOG_WARNING( "no large enough working area available, can't do block memory writes"); @@ -546,7 +543,7 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer, buf_set_u32(reg_params[3].value, 0, 32, 0); retval = target_run_algorithm(target, 0, NULL, 4, reg_params, - em357_info->write_algorithm->address, 0, 10000, &armv7m_info); + write_algorithm->address, 0, 10000, &armv7m_info); if (retval != ERROR_OK) { LOG_ERROR("error executing em357 flash write algorithm"); break; @@ -574,7 +571,7 @@ static int em357_write_block(struct flash_bank *bank, uint8_t *buffer, } target_free_working_area(target, source); - target_free_working_area(target, em357_info->write_algorithm); + target_free_working_area(target, write_algorithm); destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); |