flash_bank_t -> struct flash_bank

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

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index cdee571939881fbc125f2c8d9c687d980942dcfa..b3e8dffc7a3a36ac734a6fc5626b77b4b781e06f 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -33,9 +33,9 @@
 
 static uint32_t bank1start = 0x00080000;
 
-static int str9x_build_block_list(struct flash_bank_s *bank)
+static int str9x_build_block_list(struct flash_bank *bank)
 {
-       str9x_flash_bank_t *str9x_info = bank->driver_priv;
+       struct str9x_flash_bank *str9x_info = bank->driver_priv;
 
        int i;
        int num_sectors;
@@ -83,7 +83,7 @@ static int str9x_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);
        str9x_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
        num_sectors = 0;
@@ -118,7 +118,7 @@ static int str9x_build_block_list(struct flash_bank_s *bank)
  */
 FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 {
-       str9x_flash_bank_t *str9x_info;
+       struct str9x_flash_bank *str9x_info;
 
        if (argc < 6)
        {
@@ -126,7 +126,7 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       str9x_info = malloc(sizeof(str9x_flash_bank_t));
+       str9x_info = malloc(sizeof(struct str9x_flash_bank));
        bank->driver_priv = str9x_info;
 
        str9x_build_block_list(bank);
@@ -136,11 +136,11 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
        return ERROR_OK;
 }
 
-static int str9x_protect_check(struct flash_bank_s *bank)
+static int str9x_protect_check(struct flash_bank *bank)
 {
        int retval;
-       str9x_flash_bank_t *str9x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct str9x_flash_bank *str9x_info = bank->driver_priv;
+       struct target *target = bank->target;
 
        int i;
        uint32_t adr;
@@ -214,9 +214,9 @@ static int str9x_protect_check(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-static int str9x_erase(struct flash_bank_s *bank, int first, int last)
+static int str9x_erase(struct flash_bank *bank, int first, int last)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        int i;
        uint32_t adr;
        uint8_t status;
@@ -306,10 +306,10 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int str9x_protect(struct flash_bank_s *bank,
+static int str9x_protect(struct flash_bank *bank,
                int set, int first, int last)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        int i;
        uint32_t adr;
        uint8_t status;
@@ -345,16 +345,16 @@ static int str9x_protect(struct flash_bank_s *bank,
        return ERROR_OK;
 }
 
-static int str9x_write_block(struct flash_bank_s *bank,
+static int str9x_write_block(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       str9x_flash_bank_t *str9x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct str9x_flash_bank *str9x_info = bank->driver_priv;
+       struct target *target = bank->target;
        uint32_t buffer_size = 8192;
-       working_area_t *source;
+       struct working_area *source;
        uint32_t address = bank->base + offset;
-       reg_param_t reg_params[4];
-       armv4_5_algorithm_t armv4_5_info;
+       struct reg_param reg_params[4];
+       struct armv4_5_algorithm armv4_5_info;
        int retval = ERROR_OK;
 
        uint32_t str9x_flash_write_code[] = {
@@ -454,10 +454,10 @@ static int str9x_write_block(struct flash_bank_s *bank,
        return retval;
 }
 
-static int str9x_write(struct flash_bank_s *bank,
+static int str9x_write(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        uint32_t words_remaining = (count / 2);
        uint32_t bytes_remaining = (count & 0x00000001);
        uint32_t address = bank->base + offset;
@@ -612,7 +612,7 @@ static int str9x_write(struct flash_bank_s *bank,
        return ERROR_OK;
 }
 
-static int str9x_probe(struct flash_bank_s *bank)
+static int str9x_probe(struct flash_bank *bank)
 {
        return ERROR_OK;
 }
@@ -624,7 +624,7 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int str9x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "str9x flash driver info");
        return ERROR_OK;
@@ -632,15 +632,15 @@ static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
 COMMAND_HANDLER(str9x_handle_flash_config_command)
 {
-       str9x_flash_bank_t *str9x_info;
-       target_t *target = NULL;
+       struct str9x_flash_bank *str9x_info;
+       struct target *target = NULL;
 
        if (argc < 5)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       flash_bank_t *bank;
+       struct flash_bank *bank;
        int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
        if (ERROR_OK != retval)
                return retval;
@@ -687,7 +687,7 @@ static int str9x_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-flash_driver_t str9x_flash = {
+struct flash_driver str9x_flash = {
                .name = "str9x",
                .register_commands = &str9x_register_commands,
                .flash_bank_command = &str9x_flash_bank_command,