str9xpec: use register_commands()

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

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index f59ed6155d3128809388acf0031813feae17d1d7..808e32cf8bdfe1a753cdda89ed740f8bf0c72f13 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -900,12 +900,12 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
        if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "stm32x lock <bank>");
+               command_print(CMD_CTX, "stm32x lock <bank>");
                return ERROR_OK;
        }
 
        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;
 
@@ -921,7 +921,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
        if (stm32x_erase_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "stm32x failed to erase options");
+               command_print(CMD_CTX, "stm32x failed to erase options");
                return ERROR_OK;
        }
 
@@ -930,11 +930,11 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
        if (stm32x_write_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "stm32x failed to lock device");
+               command_print(CMD_CTX, "stm32x failed to lock device");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "stm32x locked");
+       command_print(CMD_CTX, "stm32x locked");
 
        return ERROR_OK;
 }
@@ -946,12 +946,12 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 
        if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "stm32x unlock <bank>");
+               command_print(CMD_CTX, "stm32x unlock <bank>");
                return ERROR_OK;
        }
 
        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;
 
@@ -967,17 +967,17 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 
        if (stm32x_erase_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "stm32x failed to unlock device");
+               command_print(CMD_CTX, "stm32x failed to unlock device");
                return ERROR_OK;
        }
 
        if (stm32x_write_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "stm32x failed to lock device");
+               command_print(CMD_CTX, "stm32x failed to lock device");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "stm32x unlocked");
+       command_print(CMD_CTX, "stm32x unlocked");
 
        return ERROR_OK;
 }
@@ -990,12 +990,12 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 
        if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "stm32x options_read <bank>");
+               command_print(CMD_CTX, "stm32x options_read <bank>");
                return ERROR_OK;
        }
 
        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;
 
@@ -1010,30 +1010,30 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
        }
 
        target_read_u32(target, STM32_FLASH_OBR, &optionbyte);
-       command_print(cmd_ctx, "Option Byte: 0x%" PRIx32 "", optionbyte);
+       command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte);
 
        if (buf_get_u32((uint8_t*)&optionbyte, OPT_ERROR, 1))
-               command_print(cmd_ctx, "Option Byte Complement Error");
+               command_print(CMD_CTX, "Option Byte Complement Error");
 
        if (buf_get_u32((uint8_t*)&optionbyte, OPT_READOUT, 1))
-               command_print(cmd_ctx, "Readout Protection On");
+               command_print(CMD_CTX, "Readout Protection On");
        else
-               command_print(cmd_ctx, "Readout Protection Off");
+               command_print(CMD_CTX, "Readout Protection Off");
 
        if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDWDGSW, 1))
-               command_print(cmd_ctx, "Software Watchdog");
+               command_print(CMD_CTX, "Software Watchdog");
        else
-               command_print(cmd_ctx, "Hardware Watchdog");
+               command_print(CMD_CTX, "Hardware Watchdog");
 
        if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTOP, 1))
-               command_print(cmd_ctx, "Stop: No reset generated");
+               command_print(CMD_CTX, "Stop: No reset generated");
        else
-               command_print(cmd_ctx, "Stop: Reset generated");
+               command_print(CMD_CTX, "Stop: Reset generated");
 
        if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTDBY, 1))
-               command_print(cmd_ctx, "Standby: No reset generated");
+               command_print(CMD_CTX, "Standby: No reset generated");
        else
-               command_print(cmd_ctx, "Standby: Reset generated");
+               command_print(CMD_CTX, "Standby: Reset generated");
 
        return ERROR_OK;
 }
@@ -1046,12 +1046,12 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 
        if (CMD_ARGC < 4)
        {
-               command_print(cmd_ctx, "stm32x options_write <bank> <SWWDG | HWWDG> <RSTSTNDBY | NORSTSTNDBY> <RSTSTOP | NORSTSTOP>");
+               command_print(CMD_CTX, "stm32x options_write <bank> <SWWDG | HWWDG> <RSTSTNDBY | NORSTSTNDBY> <RSTSTOP | NORSTSTOP>");
                return ERROR_OK;
        }
 
        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;
 
@@ -1094,7 +1094,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 
        if (stm32x_erase_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "stm32x failed to erase options");
+               command_print(CMD_CTX, "stm32x failed to erase options");
                return ERROR_OK;
        }
 
@@ -1102,11 +1102,11 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 
        if (stm32x_write_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "stm32x failed to write options");
+               command_print(CMD_CTX, "stm32x failed to write options");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "stm32x write options complete");
+       command_print(CMD_CTX, "stm32x write options complete");
 
        return ERROR_OK;
 }
@@ -1155,12 +1155,12 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 
        if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "stm32x mass_erase <bank>");
+               command_print(CMD_CTX, "stm32x mass_erase <bank>");
                return ERROR_OK;
        }
 
        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;
 
@@ -1172,40 +1172,63 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
                        bank->sectors[i].is_erased = 1;
                }
 
-               command_print(cmd_ctx, "stm32x mass erase complete");
+               command_print(CMD_CTX, "stm32x mass erase complete");
        }
        else
        {
-               command_print(cmd_ctx, "stm32x mass erase failed");
+               command_print(CMD_CTX, "stm32x mass erase failed");
        }
 
        return ERROR_OK;
 }
 
+static const struct command_registration stm32x_exec_command_handlers[] = {
+       {
+               .name = "lock",
+               .handler = &stm32x_handle_lock_command,
+               .mode = COMMAND_EXEC,
+               .help = "lock device",
+       },
+       {
+               .name = "unlock",
+               .handler = &stm32x_handle_unlock_command,
+               .mode = COMMAND_EXEC,
+               .help = "unlock protected device",
+       },
+       {
+               .name = "mass_erase",
+               .handler = &stm32x_handle_mass_erase_command,
+               .mode = COMMAND_EXEC,
+               .help = "mass erase device",
+       },
+       {
+               .name = "options_read",
+               .handler = &stm32x_handle_options_read_command,
+               .mode = COMMAND_EXEC,
+               .help = "read device option bytes",
+       },
+       {
+               .name = "options_write",
+               .handler = &stm32x_handle_options_write_command,
+               .mode = COMMAND_EXEC,
+               .help = "write device option bytes",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration stm32x_command_handlers[] = {
+       {
+               .name = "stm32x",
+               .mode = COMMAND_ANY,
+               .help = "stm32x flash command group",
+               .chain = stm32x_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static int stm32x_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *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;
+       return register_commands(cmd_ctx, NULL, stm32x_command_handlers);
 }
-
 struct flash_driver stm32x_flash = {
                .name = "stm32x",
                .register_commands = &stm32x_register_commands,