target: don't implicitly include "algorithm.h"

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

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 5e1c9cb1323c4412278978bf7d5fe26455ed8190..19ee160ea82116925560a499d4a3b906a25e3a5e 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -27,9 +27,10 @@
 #include "str7x.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.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,18 +41,18 @@ 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)
 {
        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)
 {
        struct str7x_flash_bank *str7x_info = bank->driver_priv;
 
@@ -154,9 +155,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 +165,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 +175,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)
 {
        struct str7x_flash_bank *str7x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
 
        int i;
        uint32_t retval;
@@ -201,10 +202,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)
 {
        struct str7x_flash_bank *str7x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
 
        int i;
        uint32_t cmd;
@@ -254,10 +255,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)
 {
        struct str7x_flash_bank *str7x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        int i;
        uint32_t cmd;
        uint32_t retval;
@@ -308,15 +309,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)
 {
        struct str7x_flash_bank *str7x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       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,9 +424,9 @@ 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;
+       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);
@@ -583,7 +584,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 +596,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,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;
+       struct target *target = NULL;
        struct str7x_flash_bank *str7x_info = NULL;
 
        uint32_t flash_cmd;
@@ -616,7 +617,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,9 +672,9 @@ 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",
+       struct command *str7x_cmd = register_command(cmd_ctx, NULL, "str7x",
                        NULL, COMMAND_ANY, "str7x flash specific commands");
 
        register_command(cmd_ctx, str7x_cmd, "disable_jtag",