str7x_flash_bank_t -> struct str7x_flash_bank

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

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 028eab63098048e95dc66da59e1ad5775bd50fbd..5e1c9cb1323c4412278978bf7d5fe26455ed8190 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -47,13 +47,13 @@ str7x_mem_layout_t mem_layout_str7bank1[] = {
 
 static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg)
 {
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
        return (str7x_info->register_base | reg);
 }
 
 static int str7x_build_block_list(struct flash_bank_s *bank)
 {
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
 
        int i;
        int num_sectors;
@@ -81,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;
@@ -109,9 +109,9 @@ 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;
+       struct str7x_flash_bank *str7x_info;
 
        if (argc < 7)
        {
@@ -119,7 +119,7 @@ static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       str7x_info = malloc(sizeof(str7x_flash_bank_t));
+       str7x_info = malloc(sizeof(struct str7x_flash_bank));
        bank->driver_priv = str7x_info;
 
        /* set default bits for str71x flash */
@@ -176,7 +176,7 @@ static uint32_t str7x_result(struct flash_bank_s *bank)
 
 static int str7x_protect_check(struct flash_bank_s *bank)
 {
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
 
        int i;
@@ -203,7 +203,7 @@ static int str7x_protect_check(struct flash_bank_s *bank)
 
 static int str7x_erase(struct flash_bank_s *bank, int first, int last)
 {
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
 
        int i;
@@ -256,7 +256,7 @@ 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)
 {
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
        int i;
        uint32_t cmd;
@@ -310,7 +310,7 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last
 
 static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
        uint32_t buffer_size = 8192;
        working_area_t *source;
@@ -426,7 +426,7 @@ static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_
 static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        target_t *target = bank->target;
-       str7x_flash_bank_t *str7x_info = bank->driver_priv;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
        uint32_t dwords_remaining = (count / 8);
        uint32_t bytes_remaining = (count & 0x00000007);
        uint32_t address = bank->base + offset;
@@ -604,7 +604,7 @@ static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 COMMAND_HANDLER(str7x_handle_disable_jtag_command)
 {
        target_t *target = NULL;
-       str7x_flash_bank_t *str7x_info = NULL;
+       struct str7x_flash_bank *str7x_info = NULL;
 
        uint32_t flash_cmd;
        uint16_t ProtectionLevel = 0;
@@ -683,7 +683,7 @@ static int str7x_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-flash_driver_t str7x_flash = {
+struct flash_driver str7x_flash = {
                .name = "str7x",
                .register_commands = &str7x_register_commands,
                .flash_bank_command = &str7x_flash_bank_command,