move nand drivers to src/flash/nand/

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

diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c
index d23d2b02149e5596946529e46226d9f6404c325c..f9b87babb23708da4c6542e43a36d408eb5c8271 100644 (file)
--- a/src/flash/at91sam7.c
+++ b/src/flash/at91sam7.c
@@ -1109,7 +1109,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
 
        if (CMD_ARGC != 2)
        {
-               command_print(cmd_ctx, "at91sam7 gpnvm <bit> <set | clear>");
+               command_print(CMD_CTX, "at91sam7 gpnvm <bit> <set | clear>");
                return ERROR_OK;
        }
 
@@ -1120,7 +1120,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        }
        if (strcmp(bank->driver->name, "at91sam7"))
        {
-               command_print(cmd_ctx, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
+               command_print(CMD_CTX, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
                return ERROR_FLASH_BANK_INVALID;
        }
        if (bank->target->state != TARGET_HALTED)
@@ -1155,7 +1155,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], bit);
        if ((bit < 0) || (bit >= at91sam7_info->num_nvmbits))
        {
-               command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", CMD_ARGV[0], at91sam7_info->target_name);
+               command_print(CMD_CTX, "gpnvm bit '#%s' is out of bounds for target %s", CMD_ARGV[0], at91sam7_info->target_name);
                return ERROR_OK;
        }
 
@@ -1178,22 +1178,29 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        return ERROR_OK;
 }
 
-static int at91sam7_register_commands(struct command_context *cmd_ctx)
-{
-       struct command *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
-                       NULL, COMMAND_ANY, NULL);
-
-       register_command(cmd_ctx, at91sam7_cmd, "gpnvm",
-                       at91sam7_handle_gpnvm_command, COMMAND_EXEC,
-                       "at91sam7 gpnvm <bit> set | clear, "
-                       "set or clear one gpnvm bit");
-
-       return ERROR_OK;
-}
+static const struct command_registration at91sam7_exec_command_handlers[] = {
+       {
+               .name = "gpnvm",
+               .handler = &at91sam7_handle_gpnvm_command,
+               .mode = COMMAND_EXEC,
+               .usage = "gpnvm <bit> set | clear, "
+                       "set or clear one gpnvm bit",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration at91sam7_command_handlers[] = {
+       {
+               .name = "at91sam7",
+               .mode = COMMAND_ANY,
+               .help = "at91sam7 flash command group",
+               .chain = at91sam7_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct flash_driver at91sam7_flash = {
                .name = "at91sam7",
-               .register_commands = &at91sam7_register_commands,
+               .commands = at91sam7_command_handlers,
                .flash_bank_command = &at91sam7_flash_bank_command,
                .erase = &at91sam7_erase,
                .protect = &at91sam7_protect,