pld: use register_commands()

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

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index b4593cc54b35a98d29478c583910954246518f05..1025e61c4f266efe5c9ad0a6bb18bcdc160f22fe 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -185,7 +185,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
 
        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;
        }
 
@@ -194,7 +194,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
        device = get_pld_device_by_num(dev_id);
        if (!device)
        {
-               command_print(cmd_ctx, "pld device '#%s' is out of bounds", CMD_ARGV[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;
 }
@@ -221,7 +221,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 
        tap = jtag_tap_by_string(CMD_ARGV[1]);
        if (tap == NULL) {
-               command_print(cmd_ctx, "Tap: %s does not exist", CMD_ARGV[1]);
+               command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]);
                return ERROR_OK;
        }
 
@@ -233,16 +233,29 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
        return ERROR_OK;
 }
 
+static const struct command_registration virtex2_exec_command_handlers[] = {
+       {
+               .name = "read_stat",
+               .mode = COMMAND_EXEC,
+               .handler = &virtex2_handle_read_stat_command,
+               .help = "read status register",
+               .usage = "<device_id>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration virtex2_command_handler[] = {
+       {
+               .name = "virtex2",
+               .mode = COMMAND_ANY,
+               .help = "Virtex-II specific commands",
+               .chain = virtex2_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static int virtex2_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2",
-                       NULL, COMMAND_ANY, "virtex2 specific commands");
-
-       register_command(cmd_ctx, virtex2_cmd, "read_stat",
-                       &virtex2_handle_read_stat_command, COMMAND_EXEC,
-                       "read Virtex-II status register");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, virtex2_command_handler);
 }
 
 struct pld_driver virtex2_pld = {