X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpld%2Fpld.c;h=d0f85d74bffad1f699022a4f342f3ed318a91a1f;hb=bba2eecbc2b7d738e6f948b85ec420c084b28022;hp=5210b97b7d300c51109c7066b3d63f18dfa456cd;hpb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;p=fw%2Fopenocd

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 5210b97b7..d0f85d74b 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -22,6 +22,7 @@
 
 #include "pld.h"
 #include <helper/log.h>
+#include <helper/replacements.h>
 #include <helper/time_support.h>
 
 
@@ -68,7 +69,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 			if (pld_drivers[i]->commands) {
 				retval = register_commands(CMD_CTX, NULL,
 						pld_drivers[i]->commands);
-				if (ERROR_OK != retval) {
+				if (retval != ERROR_OK) {
 					LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
 					return ERROR_FAIL;
 				}
@@ -80,7 +81,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 
 			retval = CALL_COMMAND_HANDLER(
 					pld_drivers[i]->pld_device_command, c);
-			if (ERROR_OK != retval) {
+			if (retval != ERROR_OK) {
 				LOG_ERROR("'%s' driver rejected pld device",
 					CMD_ARGV[0]);
 				free(c);
@@ -116,12 +117,12 @@ COMMAND_HANDLER(handle_pld_devices_command)
 	int i = 0;
 
 	if (!pld_devices) {
-		command_print(CMD_CTX, "no pld devices configured");
+		command_print(CMD, "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, "#%i: %s", i++, p->driver->name);
 
 	return ERROR_OK;
 }
@@ -141,13 +142,13 @@ COMMAND_HANDLER(handle_pld_load_command)
 	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", CMD_ARGV[0]);
+		command_print(CMD, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
 		return 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",
+		command_print(CMD, "failed loading file %s to pld device %u",
 			CMD_ARGV[1], dev_id);
 		switch (retval) {
 		}
@@ -156,7 +157,7 @@ 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",
+		command_print(CMD, "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);
 	}
@@ -170,6 +171,7 @@ static const struct command_registration pld_exec_command_handlers[] = {
 		.handler = handle_pld_devices_command,
 		.mode = COMMAND_EXEC,
 		.help = "list configured pld devices",
+		.usage = "",
 	},
 	{
 		.name = "load",
@@ -186,8 +188,7 @@ static int pld_init(struct command_context *cmd_ctx)
 	if (!pld_devices)
 		return ERROR_OK;
 
-	struct command *parent = command_find_in_context(cmd_ctx, "pld");
-	return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
+	return register_commands(cmd_ctx, "pld", pld_exec_command_handlers);
 }
 
 COMMAND_HANDLER(handle_pld_init_command)