X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstm32x.c;h=2f51aa55a9463ec4b6cf435ff441c4ec0bbd45ac;hb=d5e4e23f9a5b1074cd298d5386e638a9fa78b1ad;hp=95d15a95189dda15702c6ef103bef8968706fddf;hpb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;p=openocd.git

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 95d15a9518..2f51aa55a9 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -27,23 +27,24 @@
 #include "stm32x.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
-static int stm32x_mass_erase(struct flash_bank_s *bank);
+static int stm32x_mass_erase(struct flash_bank *bank);
 
 /* flash bank stm32x <base> <size> 0 0 <target#>
  */
-static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
 {
-	stm32x_flash_bank_t *stm32x_info;
+	struct stm32x_flash_bank *stm32x_info;
 
-	if (argc < 6)
+	if (CMD_ARGC < 6)
 	{
 		LOG_WARNING("incomplete flash_bank stm32x configuration");
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	stm32x_info = malloc(sizeof(stm32x_flash_bank_t));
+	stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
 	bank->driver_priv = stm32x_info;
 
 	stm32x_info->write_algorithm = NULL;
@@ -52,9 +53,9 @@ static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 	return ERROR_OK;
 }
 
-static uint32_t stm32x_get_flash_status(flash_bank_t *bank)
+static uint32_t stm32x_get_flash_status(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	target_read_u32(target, STM32_FLASH_SR, &status);
@@ -62,9 +63,9 @@ static uint32_t stm32x_get_flash_status(flash_bank_t *bank)
 	return status;
 }
 
-static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
+static uint32_t stm32x_wait_status_busy(struct flash_bank *bank, int timeout)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	/* wait for busy to clear */
@@ -81,11 +82,11 @@ static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
 	return status;
 }
 
-static int stm32x_read_options(struct flash_bank_s *bank)
+static int stm32x_read_options(struct flash_bank *bank)
 {
 	uint32_t optiondata;
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 
 	stm32x_info = bank->driver_priv;
 
@@ -109,10 +110,10 @@ static int stm32x_read_options(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_erase_options(struct flash_bank_s *bank)
+static int stm32x_erase_options(struct flash_bank *bank)
 {
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	stm32x_info = bank->driver_priv;
@@ -146,10 +147,10 @@ static int stm32x_erase_options(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_write_options(struct flash_bank_s *bank)
+static int stm32x_write_options(struct flash_bank *bank)
 {
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	stm32x_info = bank->driver_priv;
@@ -230,10 +231,10 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_protect_check(struct flash_bank_s *bank)
+static int stm32x_protect_check(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+	struct target *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
 	uint32_t protection;
 	int i, s;
@@ -302,9 +303,9 @@ static int stm32x_protect_check(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
+static int stm32x_erase(struct flash_bank *bank, int first, int last)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	int i;
 	uint32_t status;
 
@@ -343,10 +344,10 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int stm32x_protect(struct flash_bank *bank, int set, int first, int last)
 {
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 	uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
 	int i, reg, bit;
 	int status;
@@ -430,15 +431,15 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
 	return stm32x_write_options(bank);
 }
 
-static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
+	struct target *target = bank->target;
 	uint32_t buffer_size = 16384;
-	working_area_t *source;
+	struct working_area *source;
 	uint32_t address = bank->base + offset;
-	reg_param_t reg_params[4];
-	armv7m_algorithm_t armv7m_info;
+	struct reg_param reg_params[4];
+	struct armv7m_algorithm armv7m_info;
 	int retval = ERROR_OK;
 
 	uint8_t stm32x_flash_write_code[] = {
@@ -549,9 +550,9 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32
 	return retval;
 }
 
-static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int stm32x_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t words_remaining = (count / 2);
 	uint32_t bytes_remaining = (count & 0x00000001);
 	uint32_t address = bank->base + offset;
@@ -654,10 +655,10 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
 	return ERROR_OK;
 }
 
-static int stm32x_probe(struct flash_bank_s *bank)
+static int stm32x_probe(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+	struct target *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 	int i;
 	uint16_t num_pages;
 	uint32_t device_id;
@@ -756,7 +757,7 @@ static int stm32x_probe(struct flash_bank_s *bank)
 	bank->base = 0x08000000;
 	bank->size = (num_pages * page_size);
 	bank->num_sectors = num_pages;
-	bank->sectors = malloc(sizeof(flash_sector_t) * num_pages);
+	bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
 
 	for (i = 0; i < num_pages; i++)
 	{
@@ -771,9 +772,9 @@ static int stm32x_probe(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_auto_probe(struct flash_bank_s *bank)
+static int stm32x_auto_probe(struct flash_bank *bank)
 {
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 	if (stm32x_info->probed)
 		return ERROR_OK;
 	return stm32x_probe(bank);
@@ -786,9 +787,9 @@ COMMAND_HANDLER(stm32x_handle_part_id_command)
 }
 #endif
 
-static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t device_id;
 	int printed;
 
@@ -894,17 +895,17 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
 COMMAND_HANDLER(stm32x_handle_lock_command)
 {
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "stm32x lock <bank>");
+		command_print(CMD_CTX, "stm32x lock <bank>");
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -920,7 +921,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
 	if (stm32x_erase_options(bank) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "stm32x failed to erase options");
+		command_print(CMD_CTX, "stm32x failed to erase options");
 		return ERROR_OK;
 	}
 
@@ -929,28 +930,28 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
 	if (stm32x_write_options(bank) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "stm32x failed to lock device");
+		command_print(CMD_CTX, "stm32x failed to lock device");
 		return ERROR_OK;
 	}
 
-	command_print(cmd_ctx, "stm32x locked");
+	command_print(CMD_CTX, "stm32x locked");
 
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(stm32x_handle_unlock_command)
 {
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "stm32x unlock <bank>");
+		command_print(CMD_CTX, "stm32x unlock <bank>");
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -966,17 +967,17 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 
 	if (stm32x_erase_options(bank) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "stm32x failed to unlock device");
+		command_print(CMD_CTX, "stm32x failed to unlock device");
 		return ERROR_OK;
 	}
 
 	if (stm32x_write_options(bank) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "stm32x failed to lock device");
+		command_print(CMD_CTX, "stm32x failed to lock device");
 		return ERROR_OK;
 	}
 
-	command_print(cmd_ctx, "stm32x unlocked");
+	command_print(CMD_CTX, "stm32x unlocked");
 
 	return ERROR_OK;
 }
@@ -984,17 +985,17 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 COMMAND_HANDLER(stm32x_handle_options_read_command)
 {
 	uint32_t optionbyte;
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "stm32x options_read <bank>");
+		command_print(CMD_CTX, "stm32x options_read <bank>");
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1009,48 +1010,48 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 	}
 
 	target_read_u32(target, STM32_FLASH_OBR, &optionbyte);
-	command_print(cmd_ctx, "Option Byte: 0x%" PRIx32 "", optionbyte);
+	command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte);
 
 	if (buf_get_u32((uint8_t*)&optionbyte, OPT_ERROR, 1))
-		command_print(cmd_ctx, "Option Byte Complement Error");
+		command_print(CMD_CTX, "Option Byte Complement Error");
 
 	if (buf_get_u32((uint8_t*)&optionbyte, OPT_READOUT, 1))
-		command_print(cmd_ctx, "Readout Protection On");
+		command_print(CMD_CTX, "Readout Protection On");
 	else
-		command_print(cmd_ctx, "Readout Protection Off");
+		command_print(CMD_CTX, "Readout Protection Off");
 
 	if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDWDGSW, 1))
-		command_print(cmd_ctx, "Software Watchdog");
+		command_print(CMD_CTX, "Software Watchdog");
 	else
-		command_print(cmd_ctx, "Hardware Watchdog");
+		command_print(CMD_CTX, "Hardware Watchdog");
 
 	if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTOP, 1))
-		command_print(cmd_ctx, "Stop: No reset generated");
+		command_print(CMD_CTX, "Stop: No reset generated");
 	else
-		command_print(cmd_ctx, "Stop: Reset generated");
+		command_print(CMD_CTX, "Stop: Reset generated");
 
 	if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTDBY, 1))
-		command_print(cmd_ctx, "Standby: No reset generated");
+		command_print(CMD_CTX, "Standby: No reset generated");
 	else
-		command_print(cmd_ctx, "Standby: Reset generated");
+		command_print(CMD_CTX, "Standby: Reset generated");
 
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(stm32x_handle_options_write_command)
 {
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 	uint16_t optionbyte = 0xF8;
 
-	if (argc < 4)
+	if (CMD_ARGC < 4)
 	{
-		command_print(cmd_ctx, "stm32x options_write <bank> <SWWDG | HWWDG> <RSTSTNDBY | NORSTSTNDBY> <RSTSTOP | NORSTSTOP>");
+		command_print(CMD_CTX, "stm32x options_write <bank> <SWWDG | HWWDG> <RSTSTNDBY | NORSTSTNDBY> <RSTSTOP | NORSTSTOP>");
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1064,7 +1065,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	if (strcmp(args[1], "SWWDG") == 0)
+	if (strcmp(CMD_ARGV[1], "SWWDG") == 0)
 	{
 		optionbyte |= (1 << 0);
 	}
@@ -1073,7 +1074,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 		optionbyte &= ~(1 << 0);
 	}
 
-	if (strcmp(args[2], "NORSTSTNDBY") == 0)
+	if (strcmp(CMD_ARGV[2], "NORSTSTNDBY") == 0)
 	{
 		optionbyte |= (1 << 1);
 	}
@@ -1082,7 +1083,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 		optionbyte &= ~(1 << 1);
 	}
 
-	if (strcmp(args[3], "NORSTSTOP") == 0)
+	if (strcmp(CMD_ARGV[3], "NORSTSTOP") == 0)
 	{
 		optionbyte |= (1 << 2);
 	}
@@ -1093,7 +1094,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 
 	if (stm32x_erase_options(bank) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "stm32x failed to erase options");
+		command_print(CMD_CTX, "stm32x failed to erase options");
 		return ERROR_OK;
 	}
 
@@ -1101,18 +1102,18 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 
 	if (stm32x_write_options(bank) != ERROR_OK)
 	{
-		command_print(cmd_ctx, "stm32x failed to write options");
+		command_print(CMD_CTX, "stm32x failed to write options");
 		return ERROR_OK;
 	}
 
-	command_print(cmd_ctx, "stm32x write options complete");
+	command_print(CMD_CTX, "stm32x write options complete");
 
 	return ERROR_OK;
 }
 
-static int stm32x_mass_erase(struct flash_bank_s *bank)
+static int stm32x_mass_erase(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	if (target->state != TARGET_HALTED)
@@ -1152,14 +1153,14 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 {
 	int i;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "stm32x mass_erase <bank>");
+		command_print(CMD_CTX, "stm32x mass_erase <bank>");
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1171,43 +1172,62 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 			bank->sectors[i].is_erased = 1;
 		}
 
-		command_print(cmd_ctx, "stm32x mass erase complete");
+		command_print(CMD_CTX, "stm32x mass erase complete");
 	}
 	else
 	{
-		command_print(cmd_ctx, "stm32x mass erase failed");
+		command_print(CMD_CTX, "stm32x mass erase failed");
 	}
 
 	return ERROR_OK;
 }
 
-static int stm32x_register_commands(struct command_context_s *cmd_ctx)
-{
-	command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stm32x",
-			NULL, COMMAND_ANY, "stm32x flash specific commands");
-
-	register_command(cmd_ctx, stm32x_cmd, "lock",
-			stm32x_handle_lock_command, COMMAND_EXEC,
-			"lock device");
-	register_command(cmd_ctx, stm32x_cmd, "unlock",
-			stm32x_handle_unlock_command, COMMAND_EXEC,
-			"unlock protected device");
-	register_command(cmd_ctx, stm32x_cmd, "mass_erase",
-			stm32x_handle_mass_erase_command, COMMAND_EXEC,
-			"mass erase device");
-	register_command(cmd_ctx, stm32x_cmd, "options_read",
-			stm32x_handle_options_read_command, COMMAND_EXEC,
-			"read device option bytes");
-	register_command(cmd_ctx, stm32x_cmd, "options_write",
-			stm32x_handle_options_write_command, COMMAND_EXEC,
-			"write device option bytes");
-
-	return ERROR_OK;
-}
-
-flash_driver_t stm32x_flash = {
+static const struct command_registration stm32x_exec_command_handlers[] = {
+	{
+		.name = "lock",
+		.handler = &stm32x_handle_lock_command,
+		.mode = COMMAND_EXEC,
+		.help = "lock device",
+	},
+	{
+		.name = "unlock",
+		.handler = &stm32x_handle_unlock_command,
+		.mode = COMMAND_EXEC,
+		.help = "unlock protected device",
+	},
+	{
+		.name = "mass_erase",
+		.handler = &stm32x_handle_mass_erase_command,
+		.mode = COMMAND_EXEC,
+		.help = "mass erase device",
+	},
+	{
+		.name = "options_read",
+		.handler = &stm32x_handle_options_read_command,
+		.mode = COMMAND_EXEC,
+		.help = "read device option bytes",
+	},
+	{
+		.name = "options_write",
+		.handler = &stm32x_handle_options_write_command,
+		.mode = COMMAND_EXEC,
+		.help = "write device option bytes",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration stm32x_command_handlers[] = {
+	{
+		.name = "stm32x",
+		.mode = COMMAND_ANY,
+		.help = "stm32x flash command group",
+		.chain = stm32x_exec_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+struct flash_driver stm32x_flash = {
 		.name = "stm32x",
-		.register_commands = &stm32x_register_commands,
+		.commands = stm32x_command_handlers,
 		.flash_bank_command = &stm32x_flash_bank_command,
 		.erase = &stm32x_erase,
 		.protect = &stm32x_protect,