ecos: use register_commands()

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

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index dd393de29433eab6df5acc9c5b45b0e462736fe5..b92ecbd8bc41f0e9217337e2e9ba6b67774f74ad 100644 (file)
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -27,6 +27,7 @@
 #include "non_cfi.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 #define CFI_MAX_BUS_WIDTH      4
@@ -588,14 +589,8 @@ static int cfi_intel_info(struct flash_bank *bank, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-static int cfi_register_commands(struct command_context_s *cmd_ctx)
+static int cfi_register_commands(struct command_context *cmd_ctx)
 {
-       /*command_t *cfi_cmd = */
-       register_command(cmd_ctx, NULL, "cfi", NULL, COMMAND_ANY, "flash bank cfi <base> <size> <chip_width> <bus_width> <targetNum> [jedec_probe/x16_as_x8]");
-       /*
-       register_command(cmd_ctx, cfi_cmd, "part_id", cfi_handle_part_id_command, COMMAND_EXEC,
-                                        "print part id of cfi flash bank <num>");
-       */
        return ERROR_OK;
 }
 
@@ -605,15 +600,15 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 {
        struct cfi_flash_bank *cfi_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank cfi configuration");
                return ERROR_FLASH_BANK_INVALID;
        }
 
        uint16_t chip_width, bus_width;
-       COMMAND_PARSE_NUMBER(u16, args[3], bus_width);
-       COMMAND_PARSE_NUMBER(u16, args[4], chip_width);
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[3], bus_width);
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[4], chip_width);
 
        if ((chip_width > CFI_MAX_CHIP_WIDTH)
                        || (bus_width > CFI_MAX_BUS_WIDTH))
@@ -632,13 +627,13 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
        cfi_info->jedec_probe = 0;
        cfi_info->not_cfi = 0;
 
-       for (unsigned i = 6; i < argc; i++)
+       for (unsigned i = 6; i < CMD_ARGC; i++)
        {
-               if (strcmp(args[i], "x16_as_x8") == 0)
+               if (strcmp(CMD_ARGV[i], "x16_as_x8") == 0)
                {
                        cfi_info->x16_as_x8 = 1;
                }
-               else if (strcmp(args[i], "jedec_probe") == 0)
+               else if (strcmp(CMD_ARGV[i], "jedec_probe") == 0)
                {
                        cfi_info->jedec_probe = 1;
                }