Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
stm32x_flash_bank_t -> struct stm32x_flash_bank
[openocd.git] / src / flash / stm32x.c
diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 22bd4f978b5b65b4fbe2ede6d595f2ff55e5c2b5..1b2486dcadb91156045430546863b7f9029a3207 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -29,61 +29,13 @@
 #include "binarybuffer.h"
 
 
-static int stm32x_register_commands(struct command_context_s *cmd_ctx);
-static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int stm32x_erase(struct flash_bank_s *bank, int first, int last);
-static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int stm32x_probe(struct flash_bank_s *bank);
-static int stm32x_auto_probe(struct flash_bank_s *bank);
-//static int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int stm32x_protect_check(struct flash_bank_s *bank);
-static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
-static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int stm32x_mass_erase(struct flash_bank_s *bank);
 
-flash_driver_t stm32x_flash =
-{
-       .name = "stm32x",
-       .register_commands = stm32x_register_commands,
-       .flash_bank_command = stm32x_flash_bank_command,
-       .erase = stm32x_erase,
-       .protect = stm32x_protect,
-       .write = stm32x_write,
-       .probe = stm32x_probe,
-       .auto_probe = stm32x_auto_probe,
-       .erase_check = default_flash_mem_blank_check,
-       .protect_check = stm32x_protect_check,
-       .info = stm32x_info
-};
-
-static int stm32x_register_commands(struct command_context_s *cmd_ctx)
-{
-       command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stm32x", NULL, COMMAND_ANY, "stm32x flash specific commands");
-
-       register_command(cmd_ctx, stm32x_cmd, "lock", stm32x_handle_lock_command, COMMAND_EXEC,
-                                        "lock device");
-       register_command(cmd_ctx, stm32x_cmd, "unlock", stm32x_handle_unlock_command, COMMAND_EXEC,
-                                        "unlock protected device");
-       register_command(cmd_ctx, stm32x_cmd, "mass_erase", stm32x_handle_mass_erase_command, COMMAND_EXEC,
-                                        "mass erase device");
-       register_command(cmd_ctx, stm32x_cmd, "options_read", stm32x_handle_options_read_command, COMMAND_EXEC,
-                                        "read device option bytes");
-       register_command(cmd_ctx, stm32x_cmd, "options_write", stm32x_handle_options_write_command, COMMAND_EXEC,
-                                        "write device option bytes");
-       return ERROR_OK;
-}
-
 /* flash bank stm32x <base> <size> 0 0 <target#>
  */
-static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
 {
-       stm32x_flash_bank_t *stm32x_info;
+       struct stm32x_flash_bank *stm32x_info;
 
        if (argc < 6)
        {
@@ -91,7 +43,7 @@ static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       stm32x_info = malloc(sizeof(stm32x_flash_bank_t));
+       stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
        bank->driver_priv = stm32x_info;
 
        stm32x_info->write_algorithm = NULL;
@@ -132,7 +84,7 @@ static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
 static int stm32x_read_options(struct flash_bank_s *bank)
 {
        uint32_t optiondata;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
 
        stm32x_info = bank->driver_priv;
@@ -159,7 +111,7 @@ static int stm32x_read_options(struct flash_bank_s *bank)
 
 static int stm32x_erase_options(struct flash_bank_s *bank)
 {
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
        uint32_t status;
 
@@ -196,7 +148,7 @@ static int stm32x_erase_options(struct flash_bank_s *bank)
 
 static int stm32x_write_options(struct flash_bank_s *bank)
 {
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
        uint32_t status;
 
@@ -281,7 +233,7 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 static int stm32x_protect_check(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
        uint32_t protection;
        int i, s;
@@ -393,7 +345,7 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 
 static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
        uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
        int i, reg, bit;
@@ -480,7 +432,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
 
 static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        target_t *target = bank->target;
        uint32_t buffer_size = 16384;
        working_area_t *source;
@@ -705,7 +657,7 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
 static int stm32x_probe(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        int i;
        uint16_t num_pages;
        uint32_t device_id;
@@ -804,7 +756,7 @@ static int stm32x_probe(struct flash_bank_s *bank)
        bank->base = 0x08000000;
        bank->size = (num_pages * page_size);
        bank->num_sectors = num_pages;
-       bank->sectors = malloc(sizeof(flash_sector_t) * num_pages);
+       bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
 
        for (i = 0; i < num_pages; i++)
        {
@@ -821,14 +773,14 @@ static int stm32x_probe(struct flash_bank_s *bank)
 
 static int stm32x_auto_probe(struct flash_bank_s *bank)
 {
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        if (stm32x_info->probed)
                return ERROR_OK;
        return stm32x_probe(bank);
 }
 
 #if 0
-static int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stm32x_handle_part_id_command)
 {
        return ERROR_OK;
 }
@@ -940,11 +892,10 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stm32x_handle_lock_command)
 {
-       flash_bank_t *bank;
        target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
 
        if (argc < 1)
        {
@@ -952,12 +903,10 @@ static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *c
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        stm32x_info = bank->driver_priv;
 
@@ -989,11 +938,10 @@ static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *c
        return ERROR_OK;
 }
 
-static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stm32x_handle_unlock_command)
 {
-       flash_bank_t *bank;
        target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
 
        if (argc < 1)
        {
@@ -1001,12 +949,10 @@ static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        stm32x_info = bank->driver_priv;
 
@@ -1035,12 +981,11 @@ static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char
        return ERROR_OK;
 }
 
-static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stm32x_handle_options_read_command)
 {
-       flash_bank_t *bank;
        uint32_t optionbyte;
        target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
 
        if (argc < 1)
        {
@@ -1048,12 +993,10 @@ static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx,
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        stm32x_info = bank->driver_priv;
 
@@ -1094,11 +1037,10 @@ static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
-static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stm32x_handle_options_write_command)
 {
-       flash_bank_t *bank;
        target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        uint16_t optionbyte = 0xF8;
 
        if (argc < 4)
@@ -1107,12 +1049,10 @@ static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        stm32x_info = bank->driver_priv;
 
@@ -1208,9 +1148,8 @@ static int stm32x_mass_erase(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 {
-       flash_bank_t *bank;
        int i;
 
        if (argc < 1)
@@ -1219,12 +1158,10 @@ static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, c
                return ERROR_OK;
        }
 
-       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-       if (!bank)
-       {
-               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
-               return ERROR_OK;
-       }
+       flash_bank_t *bank;
+       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       if (ERROR_OK != retval)
+               return retval;
 
        if (stm32x_mass_erase(bank) == ERROR_OK)
        {
@@ -1243,3 +1180,41 @@ static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, c
 
        return ERROR_OK;
 }
+
+static int stm32x_register_commands(struct command_context_s *cmd_ctx)
+{
+       command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stm32x",
+                       NULL, COMMAND_ANY, "stm32x flash specific commands");
+
+       register_command(cmd_ctx, stm32x_cmd, "lock",
+                       stm32x_handle_lock_command, COMMAND_EXEC,
+                       "lock device");
+       register_command(cmd_ctx, stm32x_cmd, "unlock",
+                       stm32x_handle_unlock_command, COMMAND_EXEC,
+                       "unlock protected device");
+       register_command(cmd_ctx, stm32x_cmd, "mass_erase",
+                       stm32x_handle_mass_erase_command, COMMAND_EXEC,
+                       "mass erase device");
+       register_command(cmd_ctx, stm32x_cmd, "options_read",
+                       stm32x_handle_options_read_command, COMMAND_EXEC,
+                       "read device option bytes");
+       register_command(cmd_ctx, stm32x_cmd, "options_write",
+                       stm32x_handle_options_write_command, COMMAND_EXEC,
+                       "write device option bytes");
+
+       return ERROR_OK;
+}
+
+struct flash_driver stm32x_flash = {
+               .name = "stm32x",
+               .register_commands = &stm32x_register_commands,
+               .flash_bank_command = &stm32x_flash_bank_command,
+               .erase = &stm32x_erase,
+               .protect = &stm32x_protect,
+               .write = &stm32x_write,
+               .probe = &stm32x_probe,
+               .auto_probe = &stm32x_auto_probe,
+               .erase_check = &default_flash_mem_blank_check,
+               .protect_check = &stm32x_protect_check,
+               .info = &stm32x_info,
+       };
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)