X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm966e.c;h=b1fea08e6b72a26eaef09701e2626e858bfa110e;hp=5b464efb7e4f7c74dbcba401674448113309a2a9;hb=42ef503d37b18d907da16d26e99167566d5aabd1;hpb=865ed6ed819888910f198f0584cc1b78d1e6e363

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 5b464efb7e..b1fea08e6b 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,7 +32,7 @@
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap)
+int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct jtag_tap *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
 	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
@@ -162,8 +162,7 @@ int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value)
 	return ERROR_OK;
 }
 
-static int arm966e_handle_cp15_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(arm966e_handle_cp15_command)
 {
 	int retval;
 	target_t *target = get_current_target(cmd_ctx);
@@ -175,7 +174,7 @@ static int arm966e_handle_cp15_command(struct command_context_s *cmd_ctx,
 
 	if (target->state != TARGET_HALTED)
 	{
-		command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+		command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
 		return ERROR_OK;
 	}