X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr9xpec.c;h=c47b9c5c1464a714c8a5aea49ed282195991fe5b;hb=54be77bc79ce05cd1ce4320958d8ce9d131aea09;hp=bca3b88fc6ff769b1dc0c3a1131716094c7678fb;hpb=f0fd28a66ca5866de557941113b35de5b55b554d;p=openocd.git

diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index bca3b88fc6..c47b9c5c14 100644
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -28,78 +28,11 @@
 #include "arm7_9_common.h"
 
 
-static int str9xpec_register_commands(struct command_context_s *cmd_ctx);
-static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int str9xpec_erase(struct flash_bank_s *bank, int first, int last);
-static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int str9xpec_probe(struct flash_bank_s *bank);
-static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_protect_check(struct flash_bank_s *bank);
-static int str9xpec_erase_check(struct flash_bank_s *bank);
-static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
 static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last);
 static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector);
 static int str9xpec_write_options(struct flash_bank_s *bank);
 
-static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-flash_driver_t str9xpec_flash =
-{
-	.name = "str9xpec",
-	.register_commands = str9xpec_register_commands,
-	.flash_bank_command = str9xpec_flash_bank_command,
-	.erase = str9xpec_erase,
-	.protect = str9xpec_protect,
-	.write = str9xpec_write,
-	.probe = str9xpec_probe,
-	.auto_probe = str9xpec_probe,
-	.erase_check = str9xpec_erase_check,
-	.protect_check = str9xpec_protect_check,
-	.info = str9xpec_info
-};
-
-static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
-{
-	command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec", NULL, COMMAND_ANY, "str9xpec flash specific commands");
-
-	register_command(cmd_ctx, str9xpec_cmd, "enable_turbo", str9xpec_handle_flash_enable_turbo_command, COMMAND_EXEC,
-					 "enable str9xpec turbo mode");
-	register_command(cmd_ctx, str9xpec_cmd, "disable_turbo", str9xpec_handle_flash_disable_turbo_command, COMMAND_EXEC,
-					 "disable str9xpec turbo mode");
-	register_command(cmd_ctx, str9xpec_cmd, "options_cmap", str9xpec_handle_flash_options_cmap_command, COMMAND_EXEC,
-					 "configure str9xpec boot sector");
-	register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd", str9xpec_handle_flash_options_lvdthd_command, COMMAND_EXEC,
-					 "configure str9xpec lvd threshold");
-	register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel", str9xpec_handle_flash_options_lvdsel_command, COMMAND_EXEC,
-					 "configure str9xpec lvd selection");
-	register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn", str9xpec_handle_flash_options_lvdwarn_command, COMMAND_EXEC,
-					 "configure str9xpec lvd warning");
-	register_command(cmd_ctx, str9xpec_cmd, "options_read", str9xpec_handle_flash_options_read_command, COMMAND_EXEC,
-					 "read str9xpec options");
-	register_command(cmd_ctx, str9xpec_cmd, "options_write", str9xpec_handle_flash_options_write_command, COMMAND_EXEC,
-					 "write str9xpec options");
-	register_command(cmd_ctx, str9xpec_cmd, "lock", str9xpec_handle_flash_lock_command, COMMAND_EXEC,
-					 "lock str9xpec device");
-	register_command(cmd_ctx, str9xpec_cmd, "unlock", str9xpec_handle_flash_unlock_command, COMMAND_EXEC,
-					 "unlock str9xpec device");
-	register_command(cmd_ctx, str9xpec_cmd, "part_id", str9xpec_handle_part_id_command, COMMAND_EXEC,
-					 "print part id of str9xpec flash bank <num>");
-
-	return ERROR_OK;
-}
-
-int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
+int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end_state)
 {
 	if (tap == NULL) {
 		return ERROR_TARGET_INVALID;
@@ -107,7 +40,7 @@ int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_stat
 
 	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
 	{
-		scan_field_t field;
+		struct scan_field field;
 
 		field.tap = tap;
 		field.num_bits = tap->ir_length;
@@ -123,9 +56,9 @@ int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_stat
 	return ERROR_OK;
 }
 
-static uint8_t str9xpec_isc_status(jtag_tap_t *tap)
+static uint8_t str9xpec_isc_status(struct jtag_tap *tap)
 {
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t status;
 
 	if (str9xpec_set_instr(tap, ISC_NOOP, TAP_IRPAUSE) != ERROR_OK)
@@ -151,8 +84,8 @@ static uint8_t str9xpec_isc_status(jtag_tap_t *tap)
 static int str9xpec_isc_enable(struct flash_bank_s *bank)
 {
 	uint8_t status;
-	jtag_tap_t *tap;
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct jtag_tap *tap;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	tap = str9xpec_info->tap;
 
@@ -178,8 +111,8 @@ static int str9xpec_isc_enable(struct flash_bank_s *bank)
 static int str9xpec_isc_disable(struct flash_bank_s *bank)
 {
 	uint8_t status;
-	jtag_tap_t *tap;
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct jtag_tap *tap;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	tap = str9xpec_info->tap;
 
@@ -206,11 +139,11 @@ static int str9xpec_isc_disable(struct flash_bank_s *bank)
 
 static int str9xpec_read_config(struct flash_bank_s *bank)
 {
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t status;
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	tap = str9xpec_info->tap;
 
@@ -235,7 +168,7 @@ static int str9xpec_read_config(struct flash_bank_s *bank)
 
 static int str9xpec_build_block_list(struct flash_bank_s *bank)
 {
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	int i;
 	int num_sectors;
@@ -272,7 +205,7 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
 	num_sectors = b0_sectors + b1_sectors;
 
 	bank->num_sectors = num_sectors;
-	bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
+	bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
 	str9xpec_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
 	num_sectors = 0;
@@ -302,9 +235,9 @@ static int str9xpec_build_block_list(struct flash_bank_s *bank)
 
 /* flash bank str9x <base> <size> 0 0 <target#>
  */
-static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(str9xpec_flash_bank_command)
 {
-	str9xpec_flash_controller_t *str9xpec_info;
+	struct str9xpec_flash_controller *str9xpec_info;
 	armv4_5_common_t *armv4_5 = NULL;
 	arm7_9_common_t *arm7_9 = NULL;
 	arm_jtag_t *jtag_info = NULL;
@@ -315,7 +248,7 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
+	str9xpec_info = malloc(sizeof(struct str9xpec_flash_controller));
 	bank->driver_priv = str9xpec_info;
 
 	/* REVISIT verify that the jtag position of flash controller is
@@ -338,13 +271,13 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
 
 static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 {
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t status;
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	int i;
 	uint8_t *buffer = NULL;
 
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	tap = str9xpec_info->tap;
 
@@ -408,7 +341,7 @@ static int str9xpec_protect_check(struct flash_bank_s *bank)
 	uint8_t status;
 	int i;
 
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	status = str9xpec_read_config(bank);
 
@@ -427,13 +360,13 @@ static int str9xpec_protect_check(struct flash_bank_s *bank)
 
 static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
 {
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t status;
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	int i;
 	uint8_t *buffer = NULL;
 
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	tap = str9xpec_info->tap;
 
@@ -509,10 +442,10 @@ static int str9xpec_erase(struct flash_bank_s *bank, int first, int last)
 
 static int str9xpec_lock_device(struct flash_bank_s *bank)
 {
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t status;
-	jtag_tap_t *tap;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct jtag_tap *tap;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	str9xpec_info = bank->driver_priv;
 	tap = str9xpec_info->tap;
@@ -563,7 +496,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
 	uint8_t status;
 	int i;
 
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	status = str9xpec_read_config(bank);
 
@@ -606,9 +539,9 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
 
 static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector)
 {
-	jtag_tap_t *tap;
-	scan_field_t field;
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct jtag_tap *tap;
+	struct scan_field field;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 
 	tap = str9xpec_info->tap;
 
@@ -627,14 +560,14 @@ static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector)
 
 static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	str9xpec_flash_controller_t *str9xpec_info = bank->driver_priv;
+	struct str9xpec_flash_controller *str9xpec_info = bank->driver_priv;
 	uint32_t dwords_remaining = (count / 8);
 	uint32_t bytes_remaining = (count & 0x00000007);
 	uint32_t bytes_written = 0;
 	uint8_t status;
 	uint32_t check_address = offset;
-	jtag_tap_t *tap;
-	scan_field_t field;
+	struct jtag_tap *tap;
+	struct scan_field field;
 	uint8_t *scanbuf;
 	int i;
 	int first_sector = 0;
@@ -793,26 +726,21 @@ static int str9xpec_probe(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_part_id_command)
 {
-	flash_bank_t *bank;
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t *buffer = NULL;
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	uint32_t idcode;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 1)
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 	tap = str9xpec_info->tap;
@@ -849,11 +777,10 @@ static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_read_command)
 {
-	flash_bank_t *bank;
 	uint8_t status;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 1)
 	{
@@ -861,12 +788,10 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s *
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
@@ -910,10 +835,10 @@ static int str9xpec_handle_flash_options_read_command(struct command_context_s *
 
 static int str9xpec_write_options(struct flash_bank_s *bank)
 {
-	scan_field_t field;
+	struct scan_field field;
 	uint8_t status;
-	jtag_tap_t *tap;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct jtag_tap *tap;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	str9xpec_info = bank->driver_priv;
 	tap = str9xpec_info->tap;
@@ -969,9 +894,8 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
 	return status;
 }
 
-static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_write_command)
 {
-	flash_bank_t *bank;
 	uint8_t status;
 
 	if (argc < 1)
@@ -980,12 +904,10 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	status = str9xpec_write_options(bank);
 
@@ -995,10 +917,9 @@ static int str9xpec_handle_flash_options_write_command(struct command_context_s
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_cmap_command)
 {
-	flash_bank_t *bank;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 2)
 	{
@@ -1006,12 +927,10 @@ static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
@@ -1027,10 +946,9 @@ static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_lvdthd_command)
 {
-	flash_bank_t *bank;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 2)
 	{
@@ -1038,12 +956,10 @@ static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
@@ -1059,10 +975,9 @@ static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s
 	return ERROR_OK;
 }
 
-int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_lvdsel_command)
 {
-	flash_bank_t *bank;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 2)
 	{
@@ -1070,12 +985,10 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
@@ -1091,10 +1004,9 @@ int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_c
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_options_lvdwarn_command)
 {
-	flash_bank_t *bank;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 2)
 	{
@@ -1102,12 +1014,10 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
@@ -1123,10 +1033,9 @@ static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_lock_command)
 {
 	uint8_t status;
-	flash_bank_t *bank;
 
 	if (argc < 1)
 	{
@@ -1134,12 +1043,10 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx,
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	status = str9xpec_lock_device(bank);
 
@@ -1149,10 +1056,9 @@ static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_unlock_command)
 {
 	uint8_t status;
-	flash_bank_t *bank;
 
 	if (argc < 1)
 	{
@@ -1160,12 +1066,10 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	status = str9xpec_unlock_device(bank);
 
@@ -1175,14 +1079,12 @@ static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ct
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_enable_turbo_command)
 {
-	int retval;
-	flash_bank_t *bank;
-	jtag_tap_t *tap0;
-	jtag_tap_t *tap1;
-	jtag_tap_t *tap2;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct jtag_tap *tap0;
+	struct jtag_tap *tap1;
+	struct jtag_tap *tap2;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 1)
 	{
@@ -1190,12 +1092,10 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 
@@ -1228,11 +1128,10 @@ static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *
 	return ERROR_OK;
 }
 
-static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str9xpec_handle_flash_disable_turbo_command)
 {
-	flash_bank_t *bank;
-	jtag_tap_t *tap;
-	str9xpec_flash_controller_t *str9xpec_info = NULL;
+	struct jtag_tap *tap;
+	struct str9xpec_flash_controller *str9xpec_info = NULL;
 
 	if (argc < 1)
 	{
@@ -1240,12 +1139,10 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
 		return ERROR_OK;
 	}
 
-	bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (!bank)
-	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-		return ERROR_OK;
-	}
+	flash_bank_t *bank;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	if (ERROR_OK != retval)
+		return retval;
 
 	str9xpec_info = bank->driver_priv;
 	tap = str9xpec_info->tap;
@@ -1254,7 +1151,8 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
 		return ERROR_FAIL;
 
 	/* exit turbo mode via RESET */
-	str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET);
+	str9xpec_set_instr(tap, ISC_NOOP, TAP_IDLE);
+	jtag_add_tlr();
 	jtag_execute_queue();
 
 	/* restore previous scan chain */
@@ -1264,3 +1162,59 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
 
 	return ERROR_OK;
 }
+
+static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
+{
+	command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec",
+			NULL, COMMAND_ANY, "str9xpec flash specific commands");
+
+	register_command(cmd_ctx, str9xpec_cmd, "enable_turbo",
+			str9xpec_handle_flash_enable_turbo_command,
+			COMMAND_EXEC, "enable str9xpec turbo mode");
+	register_command(cmd_ctx, str9xpec_cmd, "disable_turbo",
+			str9xpec_handle_flash_disable_turbo_command,
+			COMMAND_EXEC, "disable str9xpec turbo mode");
+	register_command(cmd_ctx, str9xpec_cmd, "options_cmap",
+			str9xpec_handle_flash_options_cmap_command,
+			COMMAND_EXEC, "configure str9xpec boot sector");
+	register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd",
+			str9xpec_handle_flash_options_lvdthd_command,
+			COMMAND_EXEC, "configure str9xpec lvd threshold");
+	register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel",
+			str9xpec_handle_flash_options_lvdsel_command,
+			COMMAND_EXEC, "configure str9xpec lvd selection");
+	register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn",
+			str9xpec_handle_flash_options_lvdwarn_command,
+			COMMAND_EXEC, "configure str9xpec lvd warning");
+	register_command(cmd_ctx, str9xpec_cmd, "options_read",
+			str9xpec_handle_flash_options_read_command,
+			COMMAND_EXEC, "read str9xpec options");
+	register_command(cmd_ctx, str9xpec_cmd, "options_write",
+			str9xpec_handle_flash_options_write_command,
+			COMMAND_EXEC, "write str9xpec options");
+	register_command(cmd_ctx, str9xpec_cmd, "lock",
+			str9xpec_handle_flash_lock_command,
+			COMMAND_EXEC, "lock str9xpec device");
+	register_command(cmd_ctx, str9xpec_cmd, "unlock",
+			str9xpec_handle_flash_unlock_command,
+			COMMAND_EXEC, "unlock str9xpec device");
+	register_command(cmd_ctx, str9xpec_cmd, "part_id",
+			str9xpec_handle_part_id_command,
+			COMMAND_EXEC, "print part id of str9xpec flash bank <num>");
+
+	return ERROR_OK;
+}
+
+struct flash_driver str9xpec_flash = {
+		.name = "str9xpec",
+		.register_commands = &str9xpec_register_commands,
+		.flash_bank_command = &str9xpec_flash_bank_command,
+		.erase = &str9xpec_erase,
+		.protect = &str9xpec_protect,
+		.write = &str9xpec_write,
+		.probe = &str9xpec_probe,
+		.auto_probe = &str9xpec_probe,
+		.erase_check = &str9xpec_erase_check,
+		.protect_check = &str9xpec_protect_check,
+		.info = &str9xpec_info,
+	};