X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Flpc2000.c;h=418b5b0345dff8bff3c3421dc24d92b79a3dc0a4;hb=d5e4e23f9a5b1074cd298d5386e638a9fa78b1ad;hp=63781309790af0359d3983b4099bae4ff1d02a64;hpb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;p=openocd.git

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index 6378130979..418b5b0345 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -26,7 +26,6 @@
 #endif
 
 #include "lpc2000.h"
-#include "armv4_5.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
 #include "algorithm.h"
@@ -750,7 +749,7 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command)
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -764,34 +763,41 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command)
 	{
 		if (status_code == ERROR_FLASH_OPERATION_FAILED)
 		{
-			command_print(cmd_ctx, "no sufficient working area specified, can't access LPC2000 IAP interface");
+			command_print(CMD_CTX, "no sufficient working area specified, can't access LPC2000 IAP interface");
 			return ERROR_OK;
 		}
-		command_print(cmd_ctx, "lpc2000 IAP returned status code %i", status_code);
+		command_print(CMD_CTX, "lpc2000 IAP returned status code %i", status_code);
 	}
 	else
 	{
-		command_print(cmd_ctx, "lpc2000 part id: 0x%8.8" PRIx32 , result_table[0]);
+		command_print(CMD_CTX, "lpc2000 part id: 0x%8.8" PRIx32 , result_table[0]);
 	}
 
 	return ERROR_OK;
 }
 
-static int lpc2000_register_commands(struct command_context *cmd_ctx)
-{
-	struct command *lpc2000_cmd = register_command(cmd_ctx, NULL, "lpc2000",
-			NULL, COMMAND_ANY, NULL);
-
-	register_command(cmd_ctx, lpc2000_cmd, "part_id",
-			lpc2000_handle_part_id_command, COMMAND_EXEC,
-			"print part id of lpc2000 flash bank <num>");
-
-	return ERROR_OK;
-}
+static const struct command_registration lpc2000_exec_command_handlers[] = {
+	{
+		.name = "part_id",
+		.handler = &lpc2000_handle_part_id_command,
+		.mode = COMMAND_EXEC,
+		.help = "print part id of lpc2000 flash bank <num>",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration lpc2000_command_handlers[] = {
+	{
+		.name = "lpc2000",
+		.mode = COMMAND_ANY,
+		.help = "lpc2000 flash command group",
+		.chain = lpc2000_exec_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 struct flash_driver lpc2000_flash = {
 		.name = "lpc2000",
-		.register_commands = &lpc2000_register_commands,
+		.commands = lpc2000_command_handlers,
 		.flash_bank_command = &lpc2000_flash_bank_command,
 		.erase = &lpc2000_erase,
 		.protect = &lpc2000_protect,