X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=82be73801e5a23af91a74bd53af419c4357ef541;hb=28f8e9dfb7bfaf87957c95790c3ffe5d9fbd8834;hp=f61787580ba3c56a409579d9dc83e5b32aecf118;hpb=833e7f5248778bcb31b4db1a1b91160995415203;p=openocd.git

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index f61787580b..82be73801e 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -26,6 +26,7 @@
 
 #include "arm966e.h"
 #include "target_type.h"
+#include "arm_opcodes.h"
 
 
 #if 0
@@ -221,22 +222,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 = COMMAND_REGISTER(cmd_ctx, NULL, "arm966e",
-			NULL, COMMAND_ANY,
-			"arm966e specific commands");
-	COMMAND_REGISTER(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 =
@@ -244,7 +252,7 @@ struct target_type arm966e_target =
 	.name = "arm966e",
 
 	.poll = arm7_9_poll,
-	.arch_state = armv4_5_arch_state,
+	.arch_state = arm_arch_state,
 
 	.target_request_data = arm7_9_target_request_data,
 
@@ -256,7 +264,7 @@ struct target_type arm966e_target =
 	.deassert_reset = arm7_9_deassert_reset,
 	.soft_reset_halt = arm7_9_soft_reset_halt,
 
-	.get_gdb_reg_list = armv4_5_get_gdb_reg_list,
+	.get_gdb_reg_list = arm_get_gdb_reg_list,
 
 	.read_memory = arm7_9_read_memory,
 	.write_memory = arm7_9_write_memory,
@@ -272,7 +280,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,