X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpld%2Fpld.c;h=08a537c09cd3ec7448ab689835605043e2bb0813;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hp=6a0bd93dcc917e444a720cdadfa9c488cf9082d3;hpb=6512e5e36b067ae458cb7f6a9fdfb08d38da3583;p=fw%2Fopenocd

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 6a0bd93dc..08a537c09 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -63,8 +63,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 
 	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++)
@@ -76,7 +75,7 @@ COMMAND_HANDLER(handle_pld_device_command)
 			/* register pld specific commands */
 			int retval;
 			if (pld_drivers[i]->commands) {
-				retval = register_commands(CMD_CTX, NULL, 
+				retval = register_commands(CMD_CTX, NULL,
 						pld_drivers[i]->commands);
 				if (ERROR_OK != retval)
 				{
@@ -89,10 +88,12 @@ COMMAND_HANDLER(handle_pld_device_command)
 			c->driver = pld_drivers[i];
 			c->next = NULL;
 
-			retval = CALL_COMMAND_HANDLER(pld_drivers[i]->pld_device_command, c);
+			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]);
+				LOG_ERROR("'%s' driver rejected pld device",
+						CMD_ARGV[0]);
 				free(c);
 				return ERROR_OK;
 			}
@@ -153,8 +154,7 @@ COMMAND_HANDLER(handle_pld_load_command)
 
 	if (CMD_ARGC < 2)
 	{
-		command_print(CMD_CTX, "usage: pld load <device#> <file>");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	unsigned dev_id;
@@ -191,20 +191,21 @@ COMMAND_HANDLER(handle_pld_load_command)
 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",
 	},
 	{
 		.name = "load",
-		.handler = &handle_pld_load_command,
+		.handler = handle_pld_load_command,
 		.mode = COMMAND_EXEC,
 		.help = "load configuration file into PLD",
-		.usage = "<device#> <file>",
+		.usage = "pld_num filename",
 	},
 	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;
@@ -234,15 +235,16 @@ 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",
-		.usage = "<driver> ...",
+		.usage = "driver_name [driver_args ... ]",
 	},
 	{
 		.name = "init",
 		.mode = COMMAND_CONFIG,
-		.handler = &handle_pld_init_command,
+		.handler = handle_pld_init_command,
 		.help = "initialize PLD devices",
+		.usage = ""
 	},
 	COMMAND_REGISTRATION_DONE
 };
@@ -251,7 +253,7 @@ static const struct command_registration pld_command_handler[] = {
 		.name = "pld",
 		.mode = COMMAND_ANY,
 		.help = "programmable logic device commands",
-
+		.usage = "",
 		.chain = pld_config_command_handlers,
 	},
 	COMMAND_REGISTRATION_DONE