X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fpld.c;h=d021f7bfc6089d4a7739700cd537d5840d5ae851;hp=f5f3303a5a5b280aa30217ef6b73f58af64b47b5;hb=2861877b32a7a2f4022a1c3d9b66c9b4879878ac;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/pld/pld.c b/src/pld/pld.c
index f5f3303a5a..d021f7bfc6 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -37,7 +37,7 @@ static struct pld_driver *pld_drivers[] =
 };
 
 static struct pld_device *pld_devices;
-static command_t *pld_cmd;
+static struct command *pld_cmd;
 
 struct pld_device *get_pld_device_by_num(int num)
 {
@@ -62,7 +62,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 	int i;
 	int found = 0;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		LOG_WARNING("incomplete 'pld device' command");
 		return ERROR_OK;
@@ -70,14 +70,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 +88,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 +113,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 +127,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;
@@ -147,25 +147,25 @@ COMMAND_HANDLER(handle_pld_load_command)
 
 	gettimeofday(&start, NULL);
 
-	if (argc < 2)
+	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,8 +176,8 @@ 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);
 	}