X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=03d4547d407df8307e6585479e991108da2ad1c1;hp=22c6069e3b176c9fe6537abd6550d53399cd30fe;hb=69df712d1d06b2c698bed3de086b9f734de73b7e;hpb=2689f58f2a0afa296a29ab301a4c1665b914caab

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 22c6069e3b..03d4547d40 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -31,42 +31,30 @@
 #include "image.h"
 #include "time_support.h"
 
-/* command handlers */
-static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock);
+static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
 
 /* flash drivers
  */
-extern flash_driver_t lpc2000_flash;
-extern flash_driver_t lpc288x_flash;
-extern flash_driver_t lpc2900_flash;
-extern flash_driver_t cfi_flash;
-extern flash_driver_t at91sam3_flash;
-extern flash_driver_t at91sam7_flash;
-extern flash_driver_t str7x_flash;
-extern flash_driver_t str9x_flash;
-extern flash_driver_t aduc702x_flash;
-extern flash_driver_t stellaris_flash;
-extern flash_driver_t str9xpec_flash;
-extern flash_driver_t stm32x_flash;
-extern flash_driver_t tms470_flash;
-extern flash_driver_t ecosflash_flash;
-extern flash_driver_t ocl_flash;
-extern flash_driver_t pic32mx_flash;
-extern flash_driver_t avr_flash;
-extern flash_driver_t faux_flash;
-
-flash_driver_t *flash_drivers[] = {
+extern struct flash_driver lpc2000_flash;
+extern struct flash_driver lpc288x_flash;
+extern struct flash_driver lpc2900_flash;
+extern struct flash_driver cfi_flash;
+extern struct flash_driver at91sam3_flash;
+extern struct flash_driver at91sam7_flash;
+extern struct flash_driver str7x_flash;
+extern struct flash_driver str9x_flash;
+extern struct flash_driver aduc702x_flash;
+extern struct flash_driver stellaris_flash;
+extern struct flash_driver str9xpec_flash;
+extern struct flash_driver stm32x_flash;
+extern struct flash_driver tms470_flash;
+extern struct flash_driver ecosflash_flash;
+extern struct flash_driver ocl_flash;
+extern struct flash_driver pic32mx_flash;
+extern struct flash_driver avr_flash;
+extern struct flash_driver faux_flash;
+
+struct flash_driver *flash_drivers[] = {
 	&lpc2000_flash,
 	&lpc288x_flash,
 	&lpc2900_flash,
@@ -88,11 +76,11 @@ flash_driver_t *flash_drivers[] = {
 	NULL,
 };
 
-flash_bank_t *flash_banks;
-static 	command_t *flash_cmd;
+struct flash_bank *flash_banks;
+static 	struct command *flash_cmd;
 
 /* wafer thin wrapper for invoking the flash driver */
-static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int flash_driver_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	int retval;
 
@@ -106,7 +94,7 @@ static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, uint32
 	return retval;
 }
 
-static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
+static int flash_driver_erase(struct flash_bank *bank, int first, int last)
 {
 	int retval;
 
@@ -119,7 +107,7 @@ static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
 	return retval;
 }
 
-int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last)
+int flash_driver_protect(struct flash_bank *bank, int set, int first, int last)
 {
 	int retval;
 
@@ -132,17 +120,9 @@ int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last
 	return retval;
 }
 
-int flash_register_commands(struct command_context_s *cmd_ctx)
-{
-	flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL);
-
-	register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
-	return ERROR_OK;
-}
-
 static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	flash_bank_t *p;
+	struct flash_bank *p;
 
 	if (argc != 1) {
 		Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command");
@@ -173,46 +153,9 @@ static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return JIM_OK;
 }
 
-int flash_init_drivers(struct command_context_s *cmd_ctx)
-{
-	register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the flash banks");
-
-	if (!flash_banks)
-		return ERROR_OK;
-
-	register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC,
-					 "print info about flash bank <num>");
-	register_command(cmd_ctx, flash_cmd, "probe", handle_flash_probe_command, COMMAND_EXEC,
-					 "identify flash bank <num>");
-	register_command(cmd_ctx, flash_cmd, "erase_check", handle_flash_erase_check_command, COMMAND_EXEC,
-					 "check erase state of sectors in flash bank <num>");
-	register_command(cmd_ctx, flash_cmd, "protect_check", handle_flash_protect_check_command, COMMAND_EXEC,
-					 "check protection state of sectors in flash bank <num>");
-	register_command(cmd_ctx, flash_cmd, "erase_sector", handle_flash_erase_command, COMMAND_EXEC,
-					 "erase sectors at <bank> <first> <last>");
-	register_command(cmd_ctx, flash_cmd, "erase_address", handle_flash_erase_address_command, COMMAND_EXEC,
-					 "erase address range <address> <length>");
-
-	register_command(cmd_ctx, flash_cmd, "fillw", handle_flash_fill_command, COMMAND_EXEC,
-					 "fill with pattern (no autoerase) <address> <word_pattern> <count>");
-	register_command(cmd_ctx, flash_cmd, "fillh", handle_flash_fill_command, COMMAND_EXEC,
-					 "fill with pattern <address> <halfword_pattern> <count>");
-	register_command(cmd_ctx, flash_cmd, "fillb", handle_flash_fill_command, COMMAND_EXEC,
-					 "fill with pattern <address> <byte_pattern> <count>");
-
-	register_command(cmd_ctx, flash_cmd, "write_bank", handle_flash_write_bank_command, COMMAND_EXEC,
-					 "write binary data to <bank> <file> <offset>");
-	register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC,
-					 "write_image [erase] [unlock] <file> [offset] [type]");
-	register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC,
-					 "set protection of sectors at <bank> <first> <last> <on | off>");
-
-	return ERROR_OK;
-}
-
-flash_bank_t *get_flash_bank_by_num_noprobe(int num)
+struct flash_bank *get_flash_bank_by_num_noprobe(int num)
 {
-	flash_bank_t *p;
+	struct flash_bank *p;
 	int i = 0;
 
 	for (p = flash_banks; p; p = p->next)
@@ -228,7 +171,7 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num)
 
 int flash_get_bank_count(void)
 {
-	flash_bank_t *p;
+	struct flash_bank *p;
 	int i = 0;
 	for (p = flash_banks; p; p = p->next)
 	{
@@ -237,9 +180,9 @@ int flash_get_bank_count(void)
 	return i;
 }
 
-flash_bank_t *get_flash_bank_by_num(int num)
+struct flash_bank *get_flash_bank_by_num(int num)
 {
-	flash_bank_t *p = get_flash_bank_by_num_noprobe(num);
+	struct flash_bank *p = get_flash_bank_by_num_noprobe(num);
 	int retval;
 
 	if (p == NULL)
@@ -255,11 +198,11 @@ flash_bank_t *get_flash_bank_by_num(int num)
 	return p;
 }
 
-int flash_command_get_bank_by_num(
-	struct command_context_s *cmd_ctx, char *str, flash_bank_t **bank)
+COMMAND_HELPER(flash_command_get_bank_by_num,
+	unsigned name_index, struct flash_bank **bank)
 {
 	unsigned bank_num;
-	COMMAND_PARSE_NUMBER(uint, str, bank_num);
+	COMMAND_PARSE_NUMBER(uint, args[name_index], bank_num);
 
 	*bank = get_flash_bank_by_num(bank_num);
 	if (!*bank)
@@ -272,12 +215,12 @@ int flash_command_get_bank_by_num(
 }
 
 
-static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_bank_command)
 {
 	int retval;
 	int i;
 	int found = 0;
-	target_t *target;
+	struct target *target;
 
 	if (argc < 6)
 	{
@@ -295,7 +238,7 @@ static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 		if (strcmp(args[0], flash_drivers[i]->name) != 0)
 			continue;
 
-		flash_bank_t *p, *c;
+		struct flash_bank *p, *c;
 
 		/* register flash specific commands */
 		if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
@@ -304,7 +247,7 @@ static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 			return ERROR_FAIL;
 		}
 
-		c = malloc(sizeof(flash_bank_t));
+		c = malloc(sizeof(struct flash_bank));
 		c->target = target;
 		c->driver = flash_drivers[i];
 		c->driver_priv = NULL;
@@ -316,7 +259,8 @@ static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 		c->sectors = NULL;
 		c->next = NULL;
 
-		if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
+		retval = CALL_COMMAND_HANDLER(flash_drivers[i]->flash_bank_command, c);
+		if (ERROR_OK != retval)
 		{
 			LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
 			free(c);
@@ -352,9 +296,9 @@ static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 	return ERROR_OK;
 }
 
-static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_info_command)
 {
-	flash_bank_t *p;
+	struct flash_bank *p;
 	uint32_t i = 0;
 	int j = 0;
 	int retval;
@@ -414,7 +358,7 @@ static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cm
 	return ERROR_OK;
 }
 
-static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_probe_command)
 {
 	int retval;
 
@@ -425,7 +369,7 @@ static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *c
 
 	unsigned bank_nr;
 	COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
-	flash_bank_t *p = get_flash_bank_by_num_noprobe(bank_nr);
+	struct flash_bank *p = get_flash_bank_by_num_noprobe(bank_nr);
 	if (p)
 	{
 		if ((retval = p->driver->probe(p)) == ERROR_OK)
@@ -451,15 +395,15 @@ static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *c
 	return ERROR_OK;
 }
 
-static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_erase_check_command)
 {
 	if (argc != 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	flash_bank_t *p;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+	struct flash_bank *p;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -497,14 +441,14 @@ static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, c
 	return ERROR_OK;
 }
 
-static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_erase_address_command)
 {
-	flash_bank_t *p;
+	struct flash_bank *p;
 	int retval;
 	int address;
 	int length;
 
-	target_t *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(cmd_ctx);
 
 	if (argc != 2)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -541,13 +485,13 @@ static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx,
 	return retval;
 }
 
-static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_protect_check_command)
 {
 	if (argc != 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	flash_bank_t *p;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+	struct flash_bank *p;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -567,7 +511,7 @@ static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int flash_check_sector_parameters(struct command_context_s *cmd_ctx,
+static int flash_check_sector_parameters(struct command_context *cmd_ctx,
 		uint32_t first, uint32_t last, uint32_t num_sectors)
 {
 	if (!(first <= last)) {
@@ -585,8 +529,7 @@ static int flash_check_sector_parameters(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_erase_command)
 {
 	if (argc != 2)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -596,7 +539,7 @@ static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
 	uint32_t last;
 
 	COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
-	flash_bank_t *p = get_flash_bank_by_num(bank_nr);
+	struct flash_bank *p = get_flash_bank_by_num(bank_nr);
 	if (!p)
 		return ERROR_OK;
 
@@ -626,8 +569,7 @@ static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int handle_flash_protect_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_protect_command)
 {
 	if (argc != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -638,7 +580,7 @@ static int handle_flash_protect_command(struct command_context_s *cmd_ctx,
 	int set;
 
 	COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
-	flash_bank_t *p = get_flash_bank_by_num(bank_nr);
+	struct flash_bank *p = get_flash_bank_by_num(bank_nr);
 	if (!p)
 		return ERROR_OK;
 
@@ -671,11 +613,11 @@ static int handle_flash_protect_command(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_write_image_command)
 {
-	target_t *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(cmd_ctx);
 
-	image_t image;
+	struct image image;
 	uint32_t written;
 
 	int retval;
@@ -761,7 +703,7 @@ static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, c
 	return retval;
 }
 
-static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_fill_command)
 {
 	int err = ERROR_OK;
 	uint32_t address;
@@ -772,7 +714,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	uint32_t wrote = 0;
 	uint32_t cur_size = 0;
 	uint32_t chunk_count;
-	target_t *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(cmd_ctx);
 	uint32_t i;
 	uint32_t wordsize;
 
@@ -786,7 +728,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	if (count == 0)
 		return ERROR_OK;
 
-	switch (cmd[4])
+	switch (CMD_NAME[4])
 	{
 	case 'w':
 		wordsize = 4;
@@ -830,7 +772,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	for (wrote = 0; wrote < (count*wordsize); wrote += cur_size)
 	{
 		cur_size = MIN((count*wordsize - wrote), sizeof(chunk));
-		flash_bank_t *bank;
+		struct flash_bank *bank;
 		bank = get_flash_bank_by_addr(target, address);
 		if (bank == NULL)
 		{
@@ -865,12 +807,12 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	return ERROR_OK;
 }
 
-static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_flash_write_bank_command)
 {
 	uint32_t offset;
 	uint8_t *buffer;
 	uint32_t buf_cnt;
-	fileio_t fileio;
+	struct fileio fileio;
 
 	if (argc != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -878,8 +820,8 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 	struct duration bench;
 	duration_start(&bench);
 
-	flash_bank_t *p;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+	struct flash_bank *p;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -905,7 +847,7 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
-		command_print(cmd_ctx, "wrote %lld byte from file %s to flash bank %u"
+		command_print(cmd_ctx, "wrote %zu byte from file %s to flash bank %u"
 				" at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
 				fileio.size, args[1], p->bank_number, offset,
 				duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
@@ -918,7 +860,7 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 
 void flash_set_dirty(void)
 {
-	flash_bank_t *c;
+	struct flash_bank *c;
 	int i;
 
 	/* set all flash to require erasing */
@@ -932,9 +874,9 @@ void flash_set_dirty(void)
 }
 
 /* lookup flash bank by address */
-flash_bank_t *get_flash_bank_by_addr(target_t *target, uint32_t addr)
+struct flash_bank *get_flash_bank_by_addr(struct target *target, uint32_t addr)
 {
-	flash_bank_t *c;
+	struct flash_bank *c;
 
 	/* cycle through bank list */
 	for (c = flash_banks; c; c = c->next)
@@ -956,10 +898,10 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, uint32_t addr)
 }
 
 /* erase given flash region, selects proper bank according to target and address */
-static int flash_iterate_address_range(target_t *target, uint32_t addr, uint32_t length,
-		int (*callback)(struct flash_bank_s *bank, int first, int last))
+static int flash_iterate_address_range(struct target *target, uint32_t addr, uint32_t length,
+		int (*callback)(struct flash_bank *bank, int first, int last))
 {
-	flash_bank_t *c;
+	struct flash_bank *c;
 	int first = -1;
 	int last = -1;
 	int i;
@@ -1007,30 +949,30 @@ static int flash_iterate_address_range(target_t *target, uint32_t addr, uint32_t
 
 
 
-int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
+int flash_erase_address_range(struct target *target, uint32_t addr, uint32_t length)
 {
 	return flash_iterate_address_range(target, addr, length, &flash_driver_erase);
 }
 
-static int flash_driver_unprotect(struct flash_bank_s *bank, int first, int last)
+static int flash_driver_unprotect(struct flash_bank *bank, int first, int last)
 {
 	return flash_driver_protect(bank, 0, first, last);
 }
 
-static int flash_unlock_address_range(target_t *target, uint32_t addr, uint32_t length)
+static int flash_unlock_address_range(struct target *target, uint32_t addr, uint32_t length)
 {
 	return flash_iterate_address_range(target, addr, length, &flash_driver_unprotect);
 }
 
 
 /* write (optional verify) an image to flash memory of the given target */
-static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock)
+static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock)
 {
 	int retval = ERROR_OK;
 
 	int section;
 	uint32_t section_offset;
-	flash_bank_t *c;
+	struct flash_bank *c;
 	int *padding;
 
 	section = 0;
@@ -1183,14 +1125,14 @@ static int flash_write_unlock(target_t *target, image_t *image, uint32_t *writte
 	return retval;
 }
 
-int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
+int flash_write(struct target *target, struct image *image, uint32_t *written, int erase)
 {
 	return flash_write_unlock(target, image, written, erase, false);
 }
 
-int default_flash_mem_blank_check(struct flash_bank_s *bank)
+int default_flash_mem_blank_check(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t buffer[1024];
 	int buffer_size = sizeof(buffer);
 	int i;
@@ -1235,9 +1177,9 @@ int default_flash_mem_blank_check(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-int default_flash_blank_check(struct flash_bank_s *bank)
+int default_flash_blank_check(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	int i;
 	int retval;
 	int fast_check = 0;
@@ -1274,3 +1216,65 @@ int default_flash_blank_check(struct flash_bank_s *bank)
 
 	return ERROR_OK;
 }
+
+int flash_init_drivers(struct command_context *cmd_ctx)
+{
+	register_jim(cmd_ctx, "ocd_flash_banks",
+			jim_flash_banks, "return information about the flash banks");
+
+	if (!flash_banks)
+		return ERROR_OK;
+
+	register_command(cmd_ctx, flash_cmd, "info",
+			handle_flash_info_command, COMMAND_EXEC,
+			"print info about flash bank <num>");
+	register_command(cmd_ctx, flash_cmd, "probe",
+			handle_flash_probe_command, COMMAND_EXEC,
+			"identify flash bank <num>");
+	register_command(cmd_ctx, flash_cmd, "erase_check",
+			handle_flash_erase_check_command, COMMAND_EXEC,
+			"check erase state of sectors in flash bank <num>");
+	register_command(cmd_ctx, flash_cmd, "protect_check",
+			handle_flash_protect_check_command, COMMAND_EXEC,
+			"check protection state of sectors in flash bank <num>");
+	register_command(cmd_ctx, flash_cmd, "erase_sector",
+			handle_flash_erase_command, COMMAND_EXEC,
+			"erase sectors at <bank> <first> <last>");
+	register_command(cmd_ctx, flash_cmd, "erase_address",
+			handle_flash_erase_address_command, COMMAND_EXEC,
+			"erase address range <address> <length>");
+
+	register_command(cmd_ctx, flash_cmd, "fillw",
+			handle_flash_fill_command, COMMAND_EXEC,
+			"fill with pattern (no autoerase) <address> <word_pattern> <count>");
+	register_command(cmd_ctx, flash_cmd, "fillh",
+			handle_flash_fill_command, COMMAND_EXEC,
+			"fill with pattern <address> <halfword_pattern> <count>");
+	register_command(cmd_ctx, flash_cmd, "fillb",
+			handle_flash_fill_command, COMMAND_EXEC,
+			"fill with pattern <address> <byte_pattern> <count>");
+
+	register_command(cmd_ctx, flash_cmd, "write_bank",
+			handle_flash_write_bank_command, COMMAND_EXEC,
+			"write binary data to <bank> <file> <offset>");
+	register_command(cmd_ctx, flash_cmd, "write_image",
+			handle_flash_write_image_command, COMMAND_EXEC,
+			"write_image [erase] [unlock] <file> [offset] [type]");
+	register_command(cmd_ctx, flash_cmd, "protect",
+			handle_flash_protect_command, COMMAND_EXEC,
+			"set protection of sectors at <bank> <first> <last> <on | off>");
+
+	return ERROR_OK;
+}
+
+int flash_register_commands(struct command_context *cmd_ctx)
+{
+	flash_cmd = register_command(cmd_ctx, NULL, "flash",
+			NULL, COMMAND_ANY, NULL);
+
+	register_command(cmd_ctx, flash_cmd, "bank",
+			handle_flash_bank_command, COMMAND_CONFIG,
+			"flash bank <driver> <base> <size> "
+			"<chip_width> <bus_width> <target> [driver_options ...]");
+	return ERROR_OK;
+}