X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=2abd8c43062d3b68254bf1e03d53f6898595df36;hb=a7a8a1c9e2e86902a3a5864cd257e01e0b3f6da6;hp=1a04e123f9db4e07a285bc16c8a9d307fe9660ef;hpb=ca594adb5a71f2bf60c1380172b8e61b075d9479;p=openocd.git

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 1a04e123f9..2abd8c4306 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -215,7 +215,7 @@ 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;
@@ -259,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);
@@ -295,7 +296,7 @@ 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;
 	uint32_t i = 0;
@@ -357,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;
 
@@ -394,7 +395,7 @@ 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)
 	{
@@ -440,7 +441,7 @@ 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;
 	int retval;
@@ -484,7 +485,7 @@ 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;
@@ -528,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;
@@ -569,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;
@@ -614,7 +613,7 @@ 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);
 
@@ -704,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;
@@ -729,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;
@@ -808,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;