Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Set empty usage field for commands that do not need parameters
[openocd.git] / src / pld / pld.c
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 421fc6171ad2c49285d0e5f900eb35e2fa799f58..3f23f6a00cf009c833d708d8fda4927b994b5d26 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -13,25 +13,23 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "pld.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "pld.h"
-#include "log.h"
-#include "time_support.h"
+#include <helper/log.h>
+#include <helper/time_support.h>
 
 
 /* pld drivers
  */
 extern struct pld_driver virtex2_pld;
 
 
 
 /* pld drivers
  */
 extern struct pld_driver virtex2_pld;
 
-static struct pld_driver *pld_drivers[] =
-{
+static struct pld_driver *pld_drivers[] = {
        &virtex2_pld,
        NULL,
 };
        &virtex2_pld,
        NULL,
 };
@@ -43,12 +41,9 @@ struct pld_device *get_pld_device_by_num(int num)
        struct pld_device *p;
        int i = 0;
 
        struct pld_device *p;
        int i = 0;
 
-       for (p = pld_devices; p; p = p->next)
-       {
+       for (p = pld_devices; p; p = p->next) {
                if (i++ == num)
                if (i++ == num)
-               {
                        return p;
                        return p;
-               }
        }
 
        return NULL;
        }
 
        return NULL;
@@ -62,56 +57,52 @@ COMMAND_HANDLER(handle_pld_device_command)
        int found = 0;
 
        if (CMD_ARGC < 1)
        int found = 0;
 
        if (CMD_ARGC < 1)
-       {
-               LOG_WARNING("incomplete 'pld device' command");
-               return ERROR_OK;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
 
-       for (i = 0; pld_drivers[i]; i++)
-       {
-               if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0)
-               {
+       for (i = 0; pld_drivers[i]; i++) {
+               if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0) {
                        struct pld_device *p, *c;
 
                        /* register pld specific commands */
                        struct pld_device *p, *c;
 
                        /* register pld specific commands */
-                       if (pld_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
-                       {
-                               LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
-                               exit(-1);
+                       int retval;
+                       if (pld_drivers[i]->commands) {
+                               retval = register_commands(CMD_CTX, NULL,
+                                               pld_drivers[i]->commands);
+                               if (ERROR_OK != retval) {
+                                       LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
+                                       return ERROR_FAIL;
+                               }
                        }
 
                        c = malloc(sizeof(struct pld_device));
                        c->driver = pld_drivers[i];
                        c->next = NULL;
 
                        }
 
                        c = malloc(sizeof(struct pld_device));
                        c->driver = pld_drivers[i];
                        c->next = NULL;
 
-                       int retval = CALL_COMMAND_HANDLER(pld_drivers[i]->pld_device_command, c);
-                       if (ERROR_OK != retval)
-                       {
-                               LOG_ERROR("'%s' driver rejected pld device", CMD_ARGV[0]);
+                       retval = CALL_COMMAND_HANDLER(
+                                       pld_drivers[i]->pld_device_command, c);
+                       if (ERROR_OK != retval) {
+                               LOG_ERROR("'%s' driver rejected pld device",
+                                       CMD_ARGV[0]);
                                free(c);
                                return ERROR_OK;
                        }
 
                        /* put pld device in linked list */
                                free(c);
                                return ERROR_OK;
                        }
 
                        /* put pld device in linked list */
-                       if (pld_devices)
-                       {
+                       if (pld_devices) {
                                /* find last pld device */
                                /* find last pld device */
-                               for (p = pld_devices; p && p->next; p = p->next);
+                               for (p = pld_devices; p && p->next; p = p->next)
+                                       ;
                                if (p)
                                        p->next = c;
                                if (p)
                                        p->next = c;
-                       }
-                       else
-                       {
+                       } else
                                pld_devices = c;
                                pld_devices = c;
-                       }
 
                        found = 1;
                }
        }
 
        /* no matching pld driver found */
 
                        found = 1;
                }
        }
 
        /* no matching pld driver found */
-       if (!found)
-       {
+       if (!found) {
                LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]);
                exit(-1);
        }
                LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]);
                exit(-1);
        }
@@ -124,16 +115,13 @@ COMMAND_HANDLER(handle_pld_devices_command)
        struct pld_device *p;
        int i = 0;
 
        struct pld_device *p;
        int i = 0;
 
-       if (!pld_devices)
-       {
+       if (!pld_devices) {
                command_print(CMD_CTX, "no pld devices configured");
                return ERROR_OK;
        }
 
        for (p = pld_devices; p; p = p->next)
                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;
 }
 
        return ERROR_OK;
 }
@@ -147,31 +135,24 @@ COMMAND_HANDLER(handle_pld_load_command)
        gettimeofday(&start, NULL);
 
        if (CMD_ARGC < 2)
        gettimeofday(&start, NULL);
 
        if (CMD_ARGC < 2)
-       {
-               command_print(CMD_CTX, "usage: pld load <device#> <file>");
-               return ERROR_OK;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        unsigned dev_id;
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        p = get_pld_device_by_num(dev_id);
 
        unsigned dev_id;
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        p = get_pld_device_by_num(dev_id);
-       if (!p)
-       {
+       if (!p) {
                command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
                command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
-       if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK)
-       {
+       retval = p->driver->load(p, CMD_ARGV[1]);
+       if (retval != ERROR_OK) {
                command_print(CMD_CTX, "failed loading file %s to pld device %u",
                        CMD_ARGV[1], dev_id);
                command_print(CMD_CTX, "failed loading file %s to pld device %u",
                        CMD_ARGV[1], dev_id);
-               switch (retval)
-               {
+               switch (retval) {
                }
                return retval;
                }
                return retval;
-       }
-       else
-       {
+       } else {
                gettimeofday(&end, NULL);
                timeval_subtract(&duration, &end, &start);
 
                gettimeofday(&end, NULL);
                timeval_subtract(&duration, &end, &start);
 
@@ -186,20 +167,22 @@ COMMAND_HANDLER(handle_pld_load_command)
 static const struct command_registration pld_exec_command_handlers[] = {
        {
                .name = "devices",
 static const struct command_registration pld_exec_command_handlers[] = {
        {
                .name = "devices",
-               .handler = &handle_pld_devices_command,
+               .handler = handle_pld_devices_command,
                .mode = COMMAND_EXEC,
                .help = "list configured pld devices",
                .mode = COMMAND_EXEC,
                .help = "list configured pld devices",
+               .usage = "",
        },
        {
                .name = "load",
        },
        {
                .name = "load",
-               .handler = &handle_pld_load_command,
+               .handler = handle_pld_load_command,
                .mode = COMMAND_EXEC,
                .help = "load configuration file into PLD",
                .mode = COMMAND_EXEC,
                .help = "load configuration file into PLD",
-               .usage = "<device#> <file>",
+               .usage = "pld_num filename",
        },
        COMMAND_REGISTRATION_DONE
 };
        },
        COMMAND_REGISTRATION_DONE
 };
-int pld_init(struct command_context *cmd_ctx)
+
+static int pld_init(struct command_context *cmd_ctx)
 {
        if (!pld_devices)
                return ERROR_OK;
 {
        if (!pld_devices)
                return ERROR_OK;
@@ -208,13 +191,36 @@ int pld_init(struct command_context *cmd_ctx)
        return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
 }
 
        return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
 }
 
+COMMAND_HANDLER(handle_pld_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       static bool pld_initialized;
+       if (pld_initialized) {
+               LOG_INFO("'pld init' has already been called");
+               return ERROR_OK;
+       }
+       pld_initialized = true;
+
+       LOG_DEBUG("Initializing PLDs...");
+       return pld_init(CMD_CTX);
+}
+
 static const struct command_registration pld_config_command_handlers[] = {
        {
                .name = "device",
                .mode = COMMAND_CONFIG,
 static const struct command_registration pld_config_command_handlers[] = {
        {
                .name = "device",
                .mode = COMMAND_CONFIG,
-               .handler = &handle_pld_device_command,
+               .handler = handle_pld_device_command,
                .help = "configure a PLD device",
                .help = "configure a PLD device",
-               .usage = "<driver> ...",
+               .usage = "driver_name [driver_args ... ]",
+       },
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = handle_pld_init_command,
+               .help = "initialize PLD devices",
+               .usage = ""
        },
        COMMAND_REGISTRATION_DONE
 };
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -223,7 +229,7 @@ static const struct command_registration pld_command_handler[] = {
                .name = "pld",
                .mode = COMMAND_ANY,
                .help = "programmable logic device commands",
                .name = "pld",
                .mode = COMMAND_ANY,
                .help = "programmable logic device commands",
-
+               .usage = "",
                .chain = pld_config_command_handlers,
        },
        COMMAND_REGISTRATION_DONE
                .chain = pld_config_command_handlers,
        },
        COMMAND_REGISTRATION_DONE
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)