X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr7x.c;h=83070134e7a61b15878bbce7a46bdaf2b5ad0255;hp=9738180e01f3065cdcd0dcaf51f7a1cd0c5a6ba0;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=0796dfff89bf00f82a780d7719767bcffe881d67 diff --git a/src/flash/str7x.c b/src/flash/str7x.c index 9738180e01..83070134e7 100644 --- a/src/flash/str7x.c +++ b/src/flash/str7x.c @@ -29,7 +29,7 @@ #include "binarybuffer.h" -str7x_mem_layout_t mem_layout_str7bank0[] = { +struct str7x_mem_layout mem_layout_str7bank0[] = { {0x00000000, 0x02000, 0x01}, {0x00002000, 0x02000, 0x02}, {0x00004000, 0x02000, 0x04}, @@ -40,20 +40,20 @@ str7x_mem_layout_t mem_layout_str7bank0[] = { {0x00030000, 0x10000, 0x80} }; -str7x_mem_layout_t mem_layout_str7bank1[] = { +struct str7x_mem_layout mem_layout_str7bank1[] = { {0x00000000, 0x02000, 0x10000}, {0x00002000, 0x02000, 0x20000} }; -static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg) +static int str7x_get_flash_adr(struct flash_bank *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) +static int str7x_build_block_list(struct flash_bank *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; @@ -111,7 +111,7 @@ static int str7x_build_block_list(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 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command) 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 */ @@ -154,9 +154,9 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command) return ERROR_OK; } -static uint32_t str7x_status(struct flash_bank_s *bank) +static uint32_t str7x_status(struct flash_bank *bank) { - target_t *target = bank->target; + struct target *target = bank->target; uint32_t retval; target_read_u32(target, str7x_get_flash_adr(bank, FLASH_CR0), &retval); @@ -164,9 +164,9 @@ static uint32_t str7x_status(struct flash_bank_s *bank) return retval; } -static uint32_t str7x_result(struct flash_bank_s *bank) +static uint32_t str7x_result(struct flash_bank *bank) { - target_t *target = bank->target; + struct target *target = bank->target; uint32_t retval; target_read_u32(target, str7x_get_flash_adr(bank, FLASH_ER), &retval); @@ -174,10 +174,10 @@ static uint32_t str7x_result(struct flash_bank_s *bank) return retval; } -static int str7x_protect_check(struct flash_bank_s *bank) +static int str7x_protect_check(struct flash_bank *bank) { - str7x_flash_bank_t *str7x_info = bank->driver_priv; - target_t *target = bank->target; + struct str7x_flash_bank *str7x_info = bank->driver_priv; + struct target *target = bank->target; int i; uint32_t retval; @@ -201,10 +201,10 @@ static int str7x_protect_check(struct flash_bank_s *bank) return ERROR_OK; } -static int str7x_erase(struct flash_bank_s *bank, int first, int last) +static int str7x_erase(struct flash_bank *bank, int first, int last) { - str7x_flash_bank_t *str7x_info = bank->driver_priv; - target_t *target = bank->target; + struct str7x_flash_bank *str7x_info = bank->driver_priv; + struct target *target = bank->target; int i; uint32_t cmd; @@ -254,10 +254,10 @@ static int str7x_erase(struct flash_bank_s *bank, int first, int last) return ERROR_OK; } -static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last) +static int str7x_protect(struct flash_bank *bank, int set, int first, int last) { - str7x_flash_bank_t *str7x_info = bank->driver_priv; - target_t *target = bank->target; + struct str7x_flash_bank *str7x_info = bank->driver_priv; + struct target *target = bank->target; int i; uint32_t cmd; uint32_t retval; @@ -308,15 +308,15 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last return ERROR_OK; } -static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count) +static int str7x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - str7x_flash_bank_t *str7x_info = bank->driver_priv; - target_t *target = bank->target; + struct str7x_flash_bank *str7x_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[6]; - armv4_5_algorithm_t armv4_5_info; + struct reg_param reg_params[6]; + struct armv4_5_algorithm armv4_5_info; int retval = ERROR_OK; uint32_t str7x_flash_write_code[] = { @@ -423,10 +423,10 @@ static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_ return retval; } -static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count) +static int str7x_write(struct flash_bank *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 target *target = bank->target; + 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; @@ -583,7 +583,7 @@ static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offs return ERROR_OK; } -static int str7x_probe(struct flash_bank_s *bank) +static int str7x_probe(struct flash_bank *bank) { return ERROR_OK; } @@ -595,7 +595,7 @@ COMMAND_HANDLER(str7x_handle_part_id_command) } #endif -static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size) +static int str7x_info(struct flash_bank *bank, char *buf, int buf_size) { snprintf(buf, buf_size, "str7x flash driver info"); return ERROR_OK; @@ -603,8 +603,8 @@ 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 target *target = NULL; + struct str7x_flash_bank *str7x_info = NULL; uint32_t flash_cmd; uint16_t ProtectionLevel = 0; @@ -616,7 +616,7 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command) return ERROR_OK; } - 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; @@ -671,7 +671,7 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command) return ERROR_OK; } -static int str7x_register_commands(struct command_context_s *cmd_ctx) +static int str7x_register_commands(struct command_context *cmd_ctx) { command_t *str7x_cmd = register_command(cmd_ctx, NULL, "str7x", NULL, COMMAND_ANY, "str7x flash specific commands"); @@ -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,