command_context_t -> struct command_context

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

diff --git a/src/pld/pld.c b/src/pld/pld.c
index df7e2fdafcf575529b231bc568c937b51c9af76c..f5f3303a5a5b280aa30217ef6b73f58af64b47b5 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -28,20 +28,20 @@
 
 /* pld drivers
  */
-extern pld_driver_t virtex2_pld;
+extern struct pld_driver virtex2_pld;
 
-static pld_driver_t *pld_drivers[] =
+static struct pld_driver *pld_drivers[] =
 {
        &virtex2_pld,
        NULL,
 };
 
-static pld_device_t *pld_devices;
+static struct pld_device *pld_devices;
 static command_t *pld_cmd;
 
-pld_device_t *get_pld_device_by_num(int num)
+struct pld_device *get_pld_device_by_num(int num)
 {
-       pld_device_t *p;
+       struct pld_device *p;
        int i = 0;
 
        for (p = pld_devices; p; p = p->next)
@@ -57,8 +57,7 @@ pld_device_t *get_pld_device_by_num(int num)
 
 /* pld device <driver> [driver_options ...]
  */
-static int handle_pld_device_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_pld_device_command)
 {
        int i;
        int found = 0;
@@ -73,7 +72,7 @@ static int handle_pld_device_command(struct command_context_s *cmd_ctx,
        {
                if (strcmp(args[0], pld_drivers[i]->name) == 0)
                {
-                       pld_device_t *p, *c;
+                       struct pld_device *p, *c;
 
                        /* register pld specific commands */
                        if (pld_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
@@ -82,11 +81,12 @@ static int handle_pld_device_command(struct command_context_s *cmd_ctx,
                                exit(-1);
                        }
 
-                       c = malloc(sizeof(pld_device_t));
+                       c = malloc(sizeof(struct pld_device));
                        c->driver = pld_drivers[i];
                        c->next = NULL;
 
-                       if (pld_drivers[i]->pld_device_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK)
+                       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]);
                                free(c);
@@ -120,10 +120,9 @@ static int handle_pld_device_command(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
-static int handle_pld_devices_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_pld_devices_command)
 {
-       pld_device_t *p;
+       struct pld_device *p;
        int i = 0;
 
        if (!pld_devices)
@@ -140,12 +139,11 @@ static int handle_pld_devices_command(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
-static int handle_pld_load_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_pld_load_command)
 {
        int retval;
        struct timeval start, end, duration;
-       pld_device_t *p;
+       struct pld_device *p;
 
        gettimeofday(&start, NULL);
 
@@ -186,7 +184,7 @@ static int handle_pld_load_command(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
-int pld_init(struct command_context_s *cmd_ctx)
+int pld_init(struct command_context *cmd_ctx)
 {
        if (!pld_devices)
                return ERROR_OK;
@@ -201,7 +199,7 @@ int pld_init(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-int pld_register_commands(struct command_context_s *cmd_ctx)
+int pld_register_commands(struct command_context *cmd_ctx)
 {
        pld_cmd = register_command(cmd_ctx, NULL, "pld", NULL, COMMAND_ANY, "programmable logic device commands");