X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstellaris.c;h=9bd329d17316d0f4e9329387fdf70ef5f20e1969;hb=eba5608b5227696e00437543c0226ed04cae12d5;hp=b482ce2e10c4b41b044c8c73b8cdfd3cdd39e78f;hpb=786106d725aace7637e8b628a66aa0fbc03b2e19;p=openocd.git

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index b482ce2e10..9bd329d173 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -34,39 +34,14 @@
 
 
 #define DID0_VER(did0) ((did0 >> 28)&0x07)
-static int stellaris_register_commands(struct command_context_s *cmd_ctx);
-static int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int stellaris_erase(struct flash_bank_s *bank, int first, int last);
-static int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int stellaris_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int stellaris_auto_probe(struct flash_bank_s *bank);
-static int stellaris_probe(struct flash_bank_s *bank);
-static int stellaris_protect_check(struct flash_bank_s *bank);
-static int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
 static int stellaris_read_part_info(struct flash_bank_s *bank);
 static uint32_t stellaris_get_flash_status(flash_bank_t *bank);
 static void stellaris_set_flash_mode(flash_bank_t *bank,int mode);
 //static uint32_t stellaris_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout);
 
-static int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int stellaris_mass_erase(struct flash_bank_s *bank);
 
-flash_driver_t stellaris_flash =
-{
-	.name = "stellaris",
-	.register_commands = stellaris_register_commands,
-	.flash_bank_command = stellaris_flash_bank_command,
-	.erase = stellaris_erase,
-	.protect = stellaris_protect,
-	.write = stellaris_write,
-	.probe = stellaris_probe,
-	.auto_probe = stellaris_auto_probe,
-	.erase_check = default_flash_mem_blank_check,
-	.protect_check = stellaris_protect_check,
-	.info = stellaris_info
-};
-
 static struct {
 	uint32_t partno;
 	char *partname;
@@ -238,7 +213,7 @@ static char * StellarisClassname[5] =
 
 /* flash_bank stellaris <base> <size> 0 0 <target#>
  */
-static int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 {
 	stellaris_flash_bank_t *stellaris_info;
 
@@ -264,14 +239,6 @@ static int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char
 	return ERROR_OK;
 }
 
-static int stellaris_register_commands(struct command_context_s *cmd_ctx)
-{
-	command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stellaris", NULL, COMMAND_ANY, "stellaris flash specific commands");
-
-	register_command(cmd_ctx, stm32x_cmd, "mass_erase", stellaris_handle_mass_erase_command, COMMAND_EXEC, "mass erase device");
-	return ERROR_OK;
-}
-
 static int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
 	int printed, device_class;
@@ -625,7 +592,7 @@ static int stellaris_read_part_info(struct flash_bank_s *bank)
 
 	/* provide this for the benefit of the higher flash driver layers */
 	bank->num_sectors = stellaris_info->num_pages;
-	bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
+	bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
 	for (i = 0; i < bank->num_sectors; i++)
 	{
 		bank->sectors[i].offset = i * stellaris_info->pagesize;
@@ -1160,7 +1127,7 @@ static int stellaris_mass_erase(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 {
 	int i;
 
@@ -1192,3 +1159,29 @@ static int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx
 
 	return ERROR_OK;
 }
+
+static int stellaris_register_commands(struct command_context_s *cmd_ctx)
+{
+	command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stellaris",
+			NULL, COMMAND_ANY, "stellaris flash specific commands");
+
+	register_command(cmd_ctx, stm32x_cmd, "mass_erase",
+			stellaris_handle_mass_erase_command, COMMAND_EXEC,
+			"mass erase device");
+	return ERROR_OK;
+}
+
+
+struct flash_driver stellaris_flash = {
+		.name = "stellaris",
+		.register_commands = &stellaris_register_commands,
+		.flash_bank_command = &stellaris_flash_bank_command,
+		.erase = &stellaris_erase,
+		.protect = &stellaris_protect,
+		.write = &stellaris_write,
+		.probe = &stellaris_probe,
+		.auto_probe = &stellaris_auto_probe,
+		.erase_check = &default_flash_mem_blank_check,
+		.protect_check = &stellaris_protect_check,
+		.info = &stellaris_info,
+	};