Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
rename flash and nand command helpers
[openocd.git] / src / flash / str7x.c
diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 68ba26ebefb3ca963c24f18550dc61845ab59099..b79dd17fde37fcb25c57cd97514a3c597b9c1e63 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -27,6 +27,7 @@
 #include "str7x.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 struct str7x_mem_layout mem_layout_str7bank0[] = {
@@ -45,13 +46,13 @@ struct str7x_mem_layout mem_layout_str7bank1[] = {
        {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;
 
@@ -113,7 +114,7 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 {
        struct str7x_flash_bank *str7x_info;
 
-       if (argc < 7)
+       if (CMD_ARGC < 7)
        {
                LOG_WARNING("incomplete flash_bank str7x configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -126,23 +127,23 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
        str7x_info->busy_bits = (FLASH_LOCK | FLASH_BSYA1 | FLASH_BSYA0);
        str7x_info->disable_bit = (1 << 1);
 
-       if (strcmp(args[6], "STR71x") == 0)
+       if (strcmp(CMD_ARGV[6], "STR71x") == 0)
        {
                str7x_info->register_base = 0x40100000;
        }
-       else if (strcmp(args[6], "STR73x") == 0)
+       else if (strcmp(CMD_ARGV[6], "STR73x") == 0)
        {
                str7x_info->register_base = 0x80100000;
                str7x_info->busy_bits = (FLASH_LOCK | FLASH_BSYA0);
        }
-       else if (strcmp(args[6], "STR75x") == 0)
+       else if (strcmp(CMD_ARGV[6], "STR75x") == 0)
        {
                str7x_info->register_base = 0x20100000;
                str7x_info->disable_bit = (1 << 0);
        }
        else
        {
-               LOG_ERROR("unknown STR7x variant: '%s'", args[6]);
+               LOG_ERROR("unknown STR7x variant: '%s'", CMD_ARGV[6]);
                free(str7x_info);
                return ERROR_FLASH_BANK_INVALID;
        }
@@ -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,12 +309,12 @@ 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;
        struct reg_param reg_params[6];
        struct armv4_5_algorithm armv4_5_info;
@@ -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,21 +604,21 @@ 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;
        uint16_t ProtectionLevel = 0;
        uint16_t ProtectionRegs;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "str7x disable_jtag <bank>");
+               command_print(CMD_CTX, "str7x disable_jtag <bank>");
                return ERROR_OK;
        }
 
-       flash_bank_t *bank;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       struct flash_bank *bank;
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 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",
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)