From 4da4e1cfb7d93dcedc333c11c787b83b8baf7dfa Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Sun, 30 Sep 2012 23:01:51 +0200 Subject: 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 Reviewed-on: http://openocd.zylin.com/865 Tested-by: jenkins Reviewed-by: Freddie Chopin Reviewed-by: Spencer Oliver --- src/flash/nor/str9x.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/flash/nor/str9x.c') diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c index ea8c35ea..a66541fe 100644 --- a/src/flash/nor/str9x.c +++ b/src/flash/nor/str9x.c @@ -46,7 +46,6 @@ struct str9x_flash_bank { uint32_t *sector_bits; int variant; int bank1; - struct working_area *write_algorithm; }; enum str9x_status_codes { @@ -158,8 +157,6 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command) str9x_build_block_list(bank); - str9x_info->write_algorithm = NULL; - return ERROR_OK; } @@ -352,9 +349,9 @@ static int str9x_protect(struct flash_bank *bank, static int str9x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - struct str9x_flash_bank *str9x_info = bank->driver_priv; struct target *target = bank->target; uint32_t buffer_size = 32768; + struct working_area *write_algorithm; struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[4]; @@ -390,12 +387,12 @@ static int str9x_write_block(struct flash_bank *bank, /* flash write code */ if (target_alloc_working_area(target, sizeof(str9x_flash_write_code), - &str9x_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; }; - target_write_buffer(target, str9x_info->write_algorithm->address, + target_write_buffer(target, write_algorithm->address, sizeof(str9x_flash_write_code), (uint8_t *)str9x_flash_write_code); @@ -403,10 +400,9 @@ static int str9x_write_block(struct flash_bank *bank, 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 (str9x_info->write_algorithm) - target_free_working_area(target, str9x_info->write_algorithm); + target_free_working_area(target, write_algorithm); LOG_WARNING("no large enough working area available, can't do block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; @@ -432,7 +428,7 @@ static int str9x_write_block(struct flash_bank *bank, buf_set_u32(reg_params[2].value, 0, 32, thisrun_count); retval = target_run_algorithm(target, 0, NULL, 4, reg_params, - str9x_info->write_algorithm->address, + write_algorithm->address, 0, 10000, &arm_algo); if (retval != ERROR_OK) { LOG_ERROR("error executing str9x flash write algorithm"); @@ -451,7 +447,7 @@ static int str9x_write_block(struct flash_bank *bank, } target_free_working_area(target, source); - target_free_working_area(target, str9x_info->write_algorithm); + target_free_working_area(target, write_algorithm); destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); -- cgit v1.2.3-18-g5258