X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=9fe513c9ea404298ed9f209fbe04c7d7b6903c8e;hb=1527272fb21beee7839335ea5587e879163d2ed1;hp=3b85a5cd8689e71d32f9d3889b64a99b4a1c8b1a;hpb=269040bbad7f18066f5ec5707447c33de6290ef5;p=openocd.git

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 3b85a5cd86..9fe513c9ea 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -34,10 +34,10 @@
 
 int arm966e_init_arch_info(struct target *target, struct arm966e_common *arm966e, struct jtag_tap *tap)
 {
-	struct arm9tdmi_common *arm9tdmi = &arm966e->arm9tdmi_common;
-	struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
+	struct arm7_9_common *arm7_9 = &arm966e->arm7_9_common;
 
-	arm9tdmi_init_arch_info(target, arm9tdmi, tap);
+	/* initialize arm7/arm9 specific info (including armv4_5) */
+	arm9tdmi_init_arch_info(target, arm7_9, tap);
 
 	arm966e->common_magic = ARM966E_COMMON_MAGIC;
 
@@ -165,31 +165,31 @@ int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value)
 COMMAND_HANDLER(arm966e_handle_cp15_command)
 {
 	int retval;
-	struct target *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(CMD_CTX);
 	struct arm966e_common *arm966e = target_to_arm966(target);
 
-	retval = arm966e_verify_pointer(cmd_ctx, arm966e);
+	retval = arm966e_verify_pointer(CMD_CTX, arm966e);
 	if (retval != ERROR_OK)
 		return retval;
 
 	if (target->state != TARGET_HALTED)
 	{
-		command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
+		command_print(CMD_CTX, "target must be stopped for \"%s\" command", CMD_NAME);
 		return ERROR_OK;
 	}
 
 	/* one or more argument, access a single register (write if second argument is given */
-	if (argc >= 1)
+	if (CMD_ARGC >= 1)
 	{
 		uint32_t address;
-		COMMAND_PARSE_NUMBER(u32, args[0], address);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
-		if (argc == 1)
+		if (CMD_ARGC == 1)
 		{
 			uint32_t value;
 			if ((retval = arm966e_read_cp15(target, address, &value)) != ERROR_OK)
 			{
-				command_print(cmd_ctx,
+				command_print(CMD_CTX,
 						"couldn't access reg %" PRIi32,
 						address);
 				return ERROR_OK;
@@ -199,21 +199,21 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 				return retval;
 			}
 
-			command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+			command_print(CMD_CTX, "%" PRIi32 ": %8.8" PRIx32,
 					address, value);
 		}
-		else if (argc == 2)
+		else if (CMD_ARGC == 2)
 		{
 			uint32_t value;
-			COMMAND_PARSE_NUMBER(u32, args[1], value);
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
 			if ((retval = arm966e_write_cp15(target, address, value)) != ERROR_OK)
 			{
-				command_print(cmd_ctx,
+				command_print(CMD_CTX,
 						"couldn't access reg %" PRIi32,
 						address);
 				return ERROR_OK;
 			}
-			command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+			command_print(CMD_CTX, "%" PRIi32 ": %8.8" PRIx32,
 					address, value);
 		}
 	}
@@ -221,22 +221,29 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 	return ERROR_OK;
 }
 
-/** Registers commands used to access coprocessor resources. */
-int arm966e_register_commands(struct command_context *cmd_ctx)
-{
-	int retval;
-	struct command *arm966e_cmd;
-
-	retval = arm9tdmi_register_commands(cmd_ctx);
-	arm966e_cmd = register_command(cmd_ctx, NULL, "arm966e",
-			NULL, COMMAND_ANY,
-			"arm966e specific commands");
-	register_command(cmd_ctx, arm966e_cmd, "cp15",
-			arm966e_handle_cp15_command, COMMAND_EXEC,
-			"display/modify cp15 register <num> [value]");
+static const struct command_registration arm966e_exec_command_handlers[] = {
+	{
+		.name = "cp15",
+		.handler = arm966e_handle_cp15_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<opcode> [value]",
+		.help = "display/modify cp15 register",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
-	return retval;
-}
+const struct command_registration arm966e_command_handlers[] = {
+	{
+		.chain = arm9tdmi_command_handlers,
+	},
+	{
+		.name = "arm966e",
+		.mode = COMMAND_ANY,
+		.help = "arm966e command group",
+		.chain = arm966e_exec_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 /** Holds methods for ARM966 targets. */
 struct target_type arm966e_target =
@@ -272,7 +279,7 @@ struct target_type arm966e_target =
 	.add_watchpoint = arm7_9_add_watchpoint,
 	.remove_watchpoint = arm7_9_remove_watchpoint,
 
-	.register_commands = arm966e_register_commands,
+	.commands = arm966e_command_handlers,
 	.target_create = arm966e_target_create,
 	.init_target = arm9tdmi_init_target,
 	.examine = arm7_9_examine,