X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstr9x.c;h=37700ce36d9bfb693fcfca15329cf8804dd091ab;hp=472f922c1f703c75a0a90ebaa25f86440a242e5f;hb=7690a74b094347ec393c280414a182b7361d7b17;hpb=9f0cba528a163645c8ecace413731c23310f2c26

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index 472f922c1f..37700ce36d 100644
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -19,9 +19,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -46,7 +44,6 @@ struct str9x_flash_bank {
 	uint32_t *sector_bits;
 	int variant;
 	int bank1;
-	struct working_area *write_algorithm;
 };
 
 enum str9x_status_codes {
@@ -158,8 +155,6 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 
 	str9x_build_block_list(bank);
 
-	str9x_info->write_algorithm = NULL;
-
 	return ERROR_OK;
 }
 
@@ -350,15 +345,15 @@ 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)
+		const 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];
-	struct arm_algorithm armv4_5_info;
+	struct arm_algorithm arm_algo;
 	int retval = ERROR_OK;
 
 	/* see contib/loaders/flash/str9x.s for src */
@@ -390,32 +385,32 @@ 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,
-			sizeof(str9x_flash_write_code),
-			(uint8_t *)str9x_flash_write_code);
+	uint8_t code[sizeof(str9x_flash_write_code)];
+	target_buffer_set_u32_array(target, code, ARRAY_SIZE(str9x_flash_write_code),
+			str9x_flash_write_code);
+	target_write_buffer(target, write_algorithm->address, sizeof(code), code);
 
 	/* memory 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 (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;
 		}
 	}
 
-	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(&reg_params[0], "r0", 32, PARAM_OUT);
 	init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
@@ -432,8 +427,8 @@ 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,
-				0, 10000, &armv4_5_info);
+				write_algorithm->address,
+				0, 10000, &arm_algo);
 		if (retval != ERROR_OK) {
 			LOG_ERROR("error executing str9x flash write algorithm");
 			retval = ERROR_FLASH_OPERATION_FAILED;
@@ -451,7 +446,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(&reg_params[0]);
 	destroy_reg_param(&reg_params[1]);
@@ -462,7 +457,7 @@ static int str9x_write_block(struct flash_bank *bank,
 }
 
 static int str9x_write(struct flash_bank *bank,
-		uint8_t *buffer, uint32_t offset, uint32_t count)
+		const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct target *target = bank->target;
 	uint32_t words_remaining = (count / 2);
@@ -610,12 +605,6 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int get_str9x_info(struct flash_bank *bank, char *buf, int buf_size)
-{
-	snprintf(buf, buf_size, "str9x flash driver info");
-	return ERROR_OK;
-}
-
 COMMAND_HANDLER(str9x_handle_flash_config_command)
 {
 	struct target *target = NULL;
@@ -690,5 +679,5 @@ struct flash_driver str9x_flash = {
 	.auto_probe = str9x_probe,
 	.erase_check = default_flash_blank_check,
 	.protect_check = str9x_protect_check,
-	.info = get_str9x_info,
+	.free_driver_priv = default_flash_free_driver_priv,
 };