pld: use register_commands()

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

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 178da97528b0b207e3138bc58340666431cdc228..421fc6171ad2c49285d0e5f900eb35e2fa799f58 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -37,7 +37,6 @@ static struct pld_driver *pld_drivers[] =
 };
 
 static struct pld_device *pld_devices;
-static struct command *pld_cmd;
 
 struct pld_device *get_pld_device_by_num(int num)
 {
@@ -70,14 +69,14 @@ COMMAND_HANDLER(handle_pld_device_command)
 
        for (i = 0; pld_drivers[i]; i++)
        {
-               if (strcmp(args[0], pld_drivers[i]->name) == 0)
+               if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0)
                {
                        struct pld_device *p, *c;
 
                        /* register pld specific commands */
-                       if (pld_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
+                       if (pld_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
                        {
-                               LOG_ERROR("couldn't register '%s' commands", args[0]);
+                               LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
                                exit(-1);
                        }
 
@@ -88,7 +87,7 @@ COMMAND_HANDLER(handle_pld_device_command)
                        int retval = CALL_COMMAND_HANDLER(pld_drivers[i]->pld_device_command, c);
                        if (ERROR_OK != retval)
                        {
-                               LOG_ERROR("'%s' driver rejected pld device", args[0]);
+                               LOG_ERROR("'%s' driver rejected pld device", CMD_ARGV[0]);
                                free(c);
                                return ERROR_OK;
                        }
@@ -113,7 +112,7 @@ COMMAND_HANDLER(handle_pld_device_command)
        /* no matching pld driver found */
        if (!found)
        {
-               LOG_ERROR("pld driver '%s' not found", args[0]);
+               LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]);
                exit(-1);
        }
 
@@ -127,13 +126,13 @@ COMMAND_HANDLER(handle_pld_devices_command)
 
        if (!pld_devices)
        {
-               command_print(cmd_ctx, "no pld devices configured");
+               command_print(CMD_CTX, "no pld devices configured");
                return ERROR_OK;
        }
 
        for (p = pld_devices; p; p = p->next)
        {
-               command_print(cmd_ctx, "#%i: %s", i++, p->driver->name);
+               command_print(CMD_CTX, "#%i: %s", i++, p->driver->name);
        }
 
        return ERROR_OK;
@@ -149,23 +148,23 @@ COMMAND_HANDLER(handle_pld_load_command)
 
        if (CMD_ARGC < 2)
        {
-               command_print(cmd_ctx, "usage: pld load <device#> <file>");
+               command_print(CMD_CTX, "usage: pld load <device#> <file>");
                return ERROR_OK;
        }
 
        unsigned dev_id;
-       COMMAND_PARSE_NUMBER(uint, args[0], dev_id);
+       COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        p = get_pld_device_by_num(dev_id);
        if (!p)
        {
-               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;
        }
 
-       if ((retval = p->driver->load(p, args[1])) != ERROR_OK)
+       if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK)
        {
-               command_print(cmd_ctx, "failed loading file %s to pld device %u",
-                       args[1], dev_id);
+               command_print(CMD_CTX, "failed loading file %s to pld device %u",
+                       CMD_ARGV[1], dev_id);
                switch (retval)
                {
                }
@@ -176,34 +175,60 @@ COMMAND_HANDLER(handle_pld_load_command)
                gettimeofday(&end, NULL);
                timeval_subtract(&duration, &end, &start);
 
-               command_print(cmd_ctx, "loaded file %s to pld device %u in %jis %jius",
-                       args[1], dev_id,
+               command_print(CMD_CTX, "loaded file %s to pld device %u in %jis %jius",
+                       CMD_ARGV[1], dev_id,
                        (intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
        }
 
        return ERROR_OK;
 }
 
+static const struct command_registration pld_exec_command_handlers[] = {
+       {
+               .name = "devices",
+               .handler = &handle_pld_devices_command,
+               .mode = COMMAND_EXEC,
+               .help = "list configured pld devices",
+       },
+       {
+               .name = "load",
+               .handler = &handle_pld_load_command,
+               .mode = COMMAND_EXEC,
+               .help = "load configuration file into PLD",
+               .usage = "<device#> <file>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
 int pld_init(struct command_context *cmd_ctx)
 {
        if (!pld_devices)
                return ERROR_OK;
 
-       register_command(cmd_ctx, pld_cmd, "devices",
-                       handle_pld_devices_command, COMMAND_EXEC,
-                       "list configured pld devices");
-       register_command(cmd_ctx, pld_cmd, "load",
-                       handle_pld_load_command, COMMAND_EXEC,
-                       "load configuration <file> into programmable logic device");
-
-       return ERROR_OK;
+       struct command *parent = command_find_in_context(cmd_ctx, "pld");
+       return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
 }
 
+static const struct command_registration pld_config_command_handlers[] = {
+       {
+               .name = "device",
+               .mode = COMMAND_CONFIG,
+               .handler = &handle_pld_device_command,
+               .help = "configure a PLD device",
+               .usage = "<driver> ...",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration pld_command_handler[] = {
+       {
+               .name = "pld",
+               .mode = COMMAND_ANY,
+               .help = "programmable logic device commands",
+
+               .chain = pld_config_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 int pld_register_commands(struct command_context *cmd_ctx)
 {
-       pld_cmd = register_command(cmd_ctx, NULL, "pld", NULL, COMMAND_ANY, "programmable logic device commands");
-
-       register_command(cmd_ctx, pld_cmd, "device", handle_pld_device_command, COMMAND_CONFIG, NULL);
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, pld_command_handler);
 }