X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpld%2Fpld.c;h=985e36485d1771d697ae11f1da47793e581bd58d;hb=c79cca04bed78839a18e73f3996805eb8001a812;hp=021a8e6f4a2573093ea11c75faabc2f8345ef161;hpb=833e7f5248778bcb31b4db1a1b91160995415203;p=fw%2Fopenocd

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 021a8e6f4..985e36485 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "pld.h"
-#include "log.h"
+#include <helper/log.h>
 #include "time_support.h"
 
 
@@ -37,7 +37,6 @@ static struct pld_driver *pld_drivers[] =
 };
 
 static struct pld_device *pld_devices;
-static struct command *pld_cmd;
 
 struct pld_device *get_pld_device_by_num(int num)
 {
@@ -75,17 +74,22 @@ COMMAND_HANDLER(handle_pld_device_command)
 			struct pld_device *p, *c;
 
 			/* register pld specific commands */
-			if (pld_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
-			{
-				LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
-				exit(-1);
+			int retval;
+			if (pld_drivers[i]->commands) {
+				retval = register_commands(CMD_CTX, NULL, 
+						pld_drivers[i]->commands);
+				if (ERROR_OK != retval)
+				{
+					LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
+					return ERROR_FAIL;
+				}
 			}
 
 			c = malloc(sizeof(struct pld_device));
 			c->driver = pld_drivers[i];
 			c->next = NULL;
 
-			int 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]);
@@ -184,26 +188,75 @@ COMMAND_HANDLER(handle_pld_load_command)
 	return ERROR_OK;
 }
 
+static const struct command_registration pld_exec_command_handlers[] = {
+	{
+		.name = "devices",
+		.handler = &handle_pld_devices_command,
+		.mode = COMMAND_EXEC,
+		.help = "list configured pld devices",
+	},
+	{
+		.name = "load",
+		.handler = &handle_pld_load_command,
+		.mode = COMMAND_EXEC,
+		.help = "load configuration file into PLD",
+		.usage = "<device#> <file>",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 int pld_init(struct command_context *cmd_ctx)
 {
 	if (!pld_devices)
 		return ERROR_OK;
 
-	COMMAND_REGISTER(cmd_ctx, pld_cmd, "devices",
-			handle_pld_devices_command, COMMAND_EXEC,
-			"list configured pld devices");
-	COMMAND_REGISTER(cmd_ctx, pld_cmd, "load",
-			handle_pld_load_command, COMMAND_EXEC,
-			"load configuration <file> into programmable logic device");
-
-	return ERROR_OK;
+	struct command *parent = command_find_in_context(cmd_ctx, "pld");
+	return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
 }
 
-int pld_register_commands(struct command_context *cmd_ctx)
+COMMAND_HANDLER(handle_pld_init_command)
 {
-	pld_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "pld", NULL, COMMAND_ANY, "programmable logic device commands");
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	COMMAND_REGISTER(cmd_ctx, pld_cmd, "device", handle_pld_device_command, COMMAND_CONFIG, NULL);
+	static bool pld_initialized = false;
+	if (pld_initialized)
+	{
+		LOG_INFO("'pld init' has already been called");
+		return ERROR_OK;
+	}
+	pld_initialized = true;
 
-	return ERROR_OK;
+	LOG_DEBUG("Initializing PLDs...");
+	return pld_init(CMD_CTX);
+}
+
+static const struct command_registration pld_config_command_handlers[] = {
+	{
+		.name = "device",
+		.mode = COMMAND_CONFIG,
+		.handler = &handle_pld_device_command,
+		.help = "configure a PLD device",
+		.usage = "<driver> ...",
+	},
+	{
+		.name = "init",
+		.mode = COMMAND_CONFIG,
+		.handler = &handle_pld_init_command,
+		.help = "initialize PLD devices",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration pld_command_handler[] = {
+	{
+		.name = "pld",
+		.mode = COMMAND_ANY,
+		.help = "programmable logic device commands",
+
+		.chain = pld_config_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+int pld_register_commands(struct command_context *cmd_ctx)
+{
+	return register_commands(cmd_ctx, NULL, pld_command_handler);
 }