use COMMAND_REGISTER macro

[fw/openocd] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index c07931e73603d6b18a6142f7c3d5f0eae1b0ead7..527434a2567cdfd1e6fd76d771450ff3d16be61c 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -183,18 +183,18 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
        struct virtex2_pld_device *virtex2_info;
        uint32_t status;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "usage: virtex2 read_stat <num>");
+               command_print(CMD_CTX, "usage: virtex2 read_stat <num>");
                return ERROR_OK;
        }
 
        unsigned dev_id;
-       COMMAND_PARSE_NUMBER(uint, args[0], dev_id);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        device = get_pld_device_by_num(dev_id);
        if (!device)
        {
-               command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);
+               command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
@@ -202,7 +202,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
 
        virtex2_read_stat(device, &status);
 
-       command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status);
+       command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status);
 
        return ERROR_OK;
 }
@@ -213,15 +213,15 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 
        struct virtex2_pld_device *virtex2_info;
 
-       if (argc < 2)
+       if (CMD_ARGC < 2)
        {
                LOG_WARNING("incomplete pld device 'virtex2' configuration");
                return ERROR_PLD_DEVICE_INVALID;
        }
 
-       tap = jtag_tap_by_string(args[1]);
+       tap = jtag_tap_by_string(CMD_ARGV[1]);
        if (tap == NULL) {
-               command_print(cmd_ctx, "Tap: %s does not exist", args[1]);
+               command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]);
                return ERROR_OK;
        }
 
@@ -235,10 +235,10 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 
 static int virtex2_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2",
+       struct command *virtex2_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "virtex2",
                        NULL, COMMAND_ANY, "virtex2 specific commands");
 
-       register_command(cmd_ctx, virtex2_cmd, "read_stat",
+       COMMAND_REGISTER(cmd_ctx, virtex2_cmd, "read_stat",
                        &virtex2_handle_read_stat_command, COMMAND_EXEC,
                        "read Virtex-II status register");