use COMMAND_REGISTER macro

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

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 4db338d532e2a83920f79cf82c61433c86f3d8de..c628f1878cc029802c7d59d2aa3f5eab0805d1b3 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -905,7 +905,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -951,7 +951,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -995,7 +995,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1051,7 +1051,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1160,7 +1160,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1184,22 +1184,22 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 
 static int stm32x_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *stm32x_cmd = register_command(cmd_ctx, NULL, "stm32x",
+       struct command *stm32x_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "stm32x",
                        NULL, COMMAND_ANY, "stm32x flash specific commands");
 
-       register_command(cmd_ctx, stm32x_cmd, "lock",
+       COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "lock",
                        stm32x_handle_lock_command, COMMAND_EXEC,
                        "lock device");
-       register_command(cmd_ctx, stm32x_cmd, "unlock",
+       COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "unlock",
                        stm32x_handle_unlock_command, COMMAND_EXEC,
                        "unlock protected device");
-       register_command(cmd_ctx, stm32x_cmd, "mass_erase",
+       COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "mass_erase",
                        stm32x_handle_mass_erase_command, COMMAND_EXEC,
                        "mass erase device");
-       register_command(cmd_ctx, stm32x_cmd, "options_read",
+       COMMAND_REGISTER(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",
+       COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "options_write",
                        stm32x_handle_options_write_command, COMMAND_EXEC,
                        "write device option bytes");