stellaris: use register_commands()

[openocd.git] / src / flash / stellaris.c

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 910d047dc01e11ecf6ffe55d0ffd13af9b1d0e4a..1cff48679dcaab4020edab3bc9c13d6fbbdea10d 100644 (file)
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -31,6 +31,7 @@
 #include "stellaris.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 #define DID0_VER(did0) ((did0 >> 28)&0x07)
@@ -217,7 +218,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 {
        struct stellaris_flash_bank *stellaris_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank stellaris configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -1131,14 +1132,14 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 {
        int i;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "stellaris mass_erase <bank>");
+               command_print(CMD_CTX, "stellaris mass_erase <bank>");
                return ERROR_OK;
        }
 
        struct flash_bank *bank;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1150,25 +1151,38 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
                        bank->sectors[i].is_erased = 1;
                }
 
-               command_print(cmd_ctx, "stellaris mass erase complete");
+               command_print(CMD_CTX, "stellaris mass erase complete");
        }
        else
        {
-               command_print(cmd_ctx, "stellaris mass erase failed");
+               command_print(CMD_CTX, "stellaris mass erase failed");
        }
 
        return ERROR_OK;
 }
 
+static const struct command_registration stellaris_exec_command_handlers[] = {
+       {
+               .name = "mass_erase",
+               .handler = &stellaris_handle_mass_erase_command,
+               .mode = COMMAND_EXEC,
+               .help = "erase entire device",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration stellaris_command_handlers[] = {
+       {
+               .name = "stellaris",
+               .mode = COMMAND_ANY,
+               .help = "Stellaris flash command group",
+               .chain = stellaris_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static int stellaris_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stellaris",
-                       NULL, COMMAND_ANY, "stellaris flash specific commands");
-
-       register_command(cmd_ctx, stm32x_cmd, "mass_erase",
-                       stellaris_handle_mass_erase_command, COMMAND_EXEC,
-                       "mass erase device");
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, stellaris_command_handlers);
 }