lpc2000_flash_bank_t -> struct lpc2000_flash_bank

[fw/openocd] / src / flash / str7x.c

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 650c0bc3b8658b2e3143eae9b4cddae970bb1c0e..1b4056bd614b78fb48ef765a29eab692debf7644 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -45,43 +45,6 @@ str7x_mem_layout_t mem_layout_str7bank1[] = {
        {0x00002000, 0x02000, 0x20000}
 };
 
-static int str7x_register_commands(struct command_context_s *cmd_ctx);
-static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int str7x_erase(struct flash_bank_s *bank, int first, int last);
-static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int str7x_probe(struct flash_bank_s *bank);
-//static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int str7x_protect_check(struct flash_bank_s *bank);
-static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
-static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-flash_driver_t str7x_flash =
-{
-       .name = "str7x",
-       .register_commands = str7x_register_commands,
-       .flash_bank_command = str7x_flash_bank_command,
-       .erase = str7x_erase,
-       .protect = str7x_protect,
-       .write = str7x_write,
-       .probe = str7x_probe,
-       .auto_probe = str7x_probe,
-       .erase_check = default_flash_blank_check,
-       .protect_check = str7x_protect_check,
-       .info = str7x_info
-};
-
-static int str7x_register_commands(struct command_context_s *cmd_ctx)
-{
-       command_t *str7x_cmd = register_command(cmd_ctx, NULL, "str7x", NULL, COMMAND_ANY, NULL);
-
-       register_command(cmd_ctx, str7x_cmd, "disable_jtag", str7x_handle_disable_jtag_command, COMMAND_EXEC,
-                                        "disable jtag access");
-
-       return ERROR_OK;
-}
-
 static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
@@ -118,7 +81,7 @@ static int str7x_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);
        str7x_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
        num_sectors = 0;
@@ -146,7 +109,7 @@ static int str7x_build_block_list(struct flash_bank_s *bank)
 
 /* flash bank str7x <base> <size> 0 0 <target#> <str71_variant>
  */
-static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 {
        str7x_flash_bank_t *str7x_info;
 
@@ -626,7 +589,7 @@ static int str7x_probe(struct flash_bank_s *bank)
 }
 
 #if 0
-static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str7x_handle_part_id_command)
 {
        return ERROR_OK;
 }
@@ -638,7 +601,7 @@ static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str7x_handle_disable_jtag_command)
 {
        target_t *target = NULL;
        str7x_flash_bank_t *str7x_info = NULL;
@@ -707,3 +670,29 @@ static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx,
 
        return ERROR_OK;
 }
+
+static int str7x_register_commands(struct command_context_s *cmd_ctx)
+{
+       command_t *str7x_cmd = register_command(cmd_ctx, NULL, "str7x",
+                       NULL, COMMAND_ANY, "str7x flash specific commands");
+
+       register_command(cmd_ctx, str7x_cmd, "disable_jtag",
+                       str7x_handle_disable_jtag_command, COMMAND_EXEC,
+                       "disable jtag access");
+
+       return ERROR_OK;
+}
+
+struct flash_driver str7x_flash = {
+               .name = "str7x",
+               .register_commands = &str7x_register_commands,
+               .flash_bank_command = &str7x_flash_bank_command,
+               .erase = &str7x_erase,
+               .protect = &str7x_protect,
+               .write = &str7x_write,
+               .probe = &str7x_probe,
+               .auto_probe = &str7x_probe,
+               .erase_check = &default_flash_blank_check,
+               .protect_check = &str7x_protect_check,
+               .info = &str7x_info,
+       };