target_t -> struct target

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

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 9738180e01f3065cdcd0dcaf51f7a1cd0c5a6ba0..d22886f96ad4443b347f50d23e3ae6f45a7234f1 100644 (file)
--- 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)
 {
-       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;
@@ -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 */
@@ -156,7 +156,7 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 
 static uint32_t str7x_status(struct flash_bank_s *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);
@@ -166,7 +166,7 @@ static uint32_t str7x_status(struct flash_bank_s *bank)
 
 static uint32_t str7x_result(struct flash_bank_s *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);
@@ -176,8 +176,8 @@ 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;
-       target_t *target = bank->target;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
+       struct target *target = bank->target;
 
        int i;
        uint32_t retval;
@@ -203,8 +203,8 @@ 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;
-       target_t *target = bank->target;
+       struct str7x_flash_bank *str7x_info = bank->driver_priv;
+       struct target *target = bank->target;
 
        int i;
        uint32_t cmd;
@@ -256,8 +256,8 @@ 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;
-       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;
@@ -310,13 +310,13 @@ 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;
-       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[] = {
@@ -425,8 +425,8 @@ 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 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;
@@ -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;
@@ -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,