move nand drivers to src/flash/nand/

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

diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index b6c4c440f4112ed99aee6317d857b4e923c11acd..9bb6c97edd2b50c4a603a9e52abf5b6499a8c110 100644 (file)
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -66,7 +66,7 @@ FLASH_BANK_COMMAND_HANDLER(pic32mx_flash_bank_command)
 {
        struct pic32mx_flash_bank *pic32mx_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank pic32mx configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -677,14 +677,14 @@ COMMAND_HANDLER(pic32mx_handle_lock_command)
        struct target *target = NULL;
        struct pic32mx_flash_bank *pic32mx_info = NULL;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "pic32mx lock <bank>");
+               command_print(CMD_CTX, "pic32mx lock <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;
 
@@ -700,7 +700,7 @@ COMMAND_HANDLER(pic32mx_handle_lock_command)
 
        if (pic32mx_erase_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "pic32mx failed to erase options");
+               command_print(CMD_CTX, "pic32mx failed to erase options");
                return ERROR_OK;
        }
 
@@ -709,11 +709,11 @@ COMMAND_HANDLER(pic32mx_handle_lock_command)
 
        if (pic32mx_write_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "pic32mx failed to lock device");
+               command_print(CMD_CTX, "pic32mx failed to lock device");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "pic32mx locked");
+       command_print(CMD_CTX, "pic32mx locked");
 
        return ERROR_OK;
 }
@@ -723,14 +723,14 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command)
        struct target *target = NULL;
        struct pic32mx_flash_bank *pic32mx_info = NULL;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "pic32mx unlock <bank>");
+               command_print(CMD_CTX, "pic32mx unlock <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;
 
@@ -746,17 +746,17 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command)
 
        if (pic32mx_erase_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "pic32mx failed to unlock device");
+               command_print(CMD_CTX, "pic32mx failed to unlock device");
                return ERROR_OK;
        }
 
        if (pic32mx_write_options(bank) != ERROR_OK)
        {
-               command_print(cmd_ctx, "pic32mx failed to lock device");
+               command_print(CMD_CTX, "pic32mx failed to lock device");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx, "pic32mx unlocked");
+       command_print(CMD_CTX, "pic32mx unlocked");
 
        return ERROR_OK;
 }
@@ -813,14 +813,14 @@ COMMAND_HANDLER(pic32mx_handle_chip_erase_command)
 #if 0
        int i;
 
-       if (argc != 0)
+       if (CMD_ARGC != 0)
        {
-               command_print(cmd_ctx, "pic32mx chip_erase");
+               command_print(CMD_CTX, "pic32mx chip_erase");
                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;
 
@@ -832,11 +832,11 @@ COMMAND_HANDLER(pic32mx_handle_chip_erase_command)
                        bank->sectors[i].is_erased = 1;
                }
 
-               command_print(cmd_ctx, "pic32mx chip erase complete");
+               command_print(CMD_CTX, "pic32mx chip erase complete");
        }
        else
        {
-               command_print(cmd_ctx, "pic32mx chip erase failed");
+               command_print(CMD_CTX, "pic32mx chip erase failed");
        }
 #endif
 
@@ -848,23 +848,23 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
        uint32_t address, value;
        int status, res;
 
-       if (argc != 3)
+       if (CMD_ARGC != 3)
        {
-               command_print(cmd_ctx, "pic32mx pgm_word <addr> <value> <bank>");
+               command_print(CMD_CTX, "pic32mx pgm_word <addr> <value> <bank>");
                return ERROR_OK;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[0], address);
-       COMMAND_PARSE_NUMBER(u32, args[1], value);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
 
        struct flash_bank *bank;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[2], &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 2, &bank);
        if (ERROR_OK != retval)
                return retval;
 
        if (address < bank->base || address >= (bank->base + bank->size))
        {
-               command_print(cmd_ctx, "flash address '%s' is out of bounds", args[0]);
+               command_print(CMD_CTX, "flash address '%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
@@ -876,37 +876,40 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
                res = ERROR_FLASH_OPERATION_FAILED;
 
        if (res == ERROR_OK)
-               command_print(cmd_ctx, "pic32mx pgm word complete");
+               command_print(CMD_CTX, "pic32mx pgm word complete");
        else
-               command_print(cmd_ctx, "pic32mx pgm word failed (status = 0x%x)", status);
+               command_print(CMD_CTX, "pic32mx pgm word failed (status = 0x%x)", status);
 
        return ERROR_OK;
 }
-
-static int pic32mx_register_commands(struct command_context *cmd_ctx)
-{
-       struct command *pic32mx_cmd = register_command(cmd_ctx, NULL, "pic32mx",
-                       NULL, COMMAND_ANY, "pic32mx flash specific commands");
-#if 0
-       register_command(cmd_ctx, pic32mx_cmd, "lock",
-                       pic32mx_handle_lock_command, COMMAND_EXEC,
-                       "lock device");
-       register_command(cmd_ctx, pic32mx_cmd, "unlock",
-                       pic32mx_handle_unlock_command, COMMAND_EXEC,
-                       "unlock protected device");
-#endif
-       register_command(cmd_ctx, pic32mx_cmd, "chip_erase",
-                       pic32mx_handle_chip_erase_command, COMMAND_EXEC,
-                       "erase device");
-       register_command(cmd_ctx, pic32mx_cmd, "pgm_word",
-                       pic32mx_handle_pgm_word_command, COMMAND_EXEC,
-                       "program a word");
-       return ERROR_OK;
-}
+static const struct command_registration pic32mx_exec_command_handlers[] = {
+       {
+               .name = "chip_erase",
+               .handler = &pic32mx_handle_chip_erase_command,
+               .mode = COMMAND_EXEC,
+               .help = "erase device",
+       },
+       {
+               .name = "pgm_word",
+               .handler = &pic32mx_handle_pgm_word_command,
+               .mode = COMMAND_EXEC,
+               .help = "program a word",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration pic32mx_command_handlers[] = {
+       {
+               .name = "pic32mx",
+               .mode = COMMAND_ANY,
+               .help = "pic32mx flash command group",
+               .chain = pic32mx_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct flash_driver pic32mx_flash = {
                .name = "pic32mx",
-               .register_commands = &pic32mx_register_commands,
+               .commands = pic32mx_command_handlers,
                .flash_bank_command = &pic32mx_flash_bank_command,
                .erase = &pic32mx_erase,
                .protect = &pic32mx_protect,