X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fpld.c;h=66f5d44bce59b9c24c2c79b89aed09c7f7e26929;hp=a9431f44d54d44b0922e32fd48ad07349d1529ef;hb=87c90393fedc8bb278d189aa53bcd93f4892012b;hpb=c4f2a018a594d5cc93f557e30a7906641b59ec56

diff --git a/src/pld/pld.c b/src/pld/pld.c
index a9431f44d5..66f5d44bce 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -13,9 +13,7 @@
  *   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
@@ -24,6 +22,7 @@
 
 #include "pld.h"
 #include <helper/log.h>
+#include <helper/replacements.h>
 #include <helper/time_support.h>
 
 
@@ -118,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;
 }
@@ -143,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) {
 		}
@@ -158,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);
 	}
@@ -172,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",
@@ -188,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)