X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftarget%2Farm966e.c;h=3b85a5cd8689e71d32f9d3889b64a99b4a1c8b1a;hb=1d4a09c2ef22dc10ec8a40183b8dd1b1102af20d;hp=6db7d79bf47207f33af26366f3a6c7a66b304d85;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;p=openocd.git

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 6db7d79bf4..3b85a5cd86 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -189,7 +189,9 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 			uint32_t value;
 			if ((retval = arm966e_read_cp15(target, address, &value)) != ERROR_OK)
 			{
-				command_print(cmd_ctx, "couldn't access reg %i", address);
+				command_print(cmd_ctx,
+						"couldn't access reg %" PRIi32,
+						address);
 				return ERROR_OK;
 			}
 			if ((retval = jtag_execute_queue()) != ERROR_OK)
@@ -197,7 +199,8 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 				return retval;
 			}
 
-			command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
+			command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+					address, value);
 		}
 		else if (argc == 2)
 		{
@@ -205,10 +208,13 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 			COMMAND_PARSE_NUMBER(u32, args[1], value);
 			if ((retval = arm966e_write_cp15(target, address, value)) != ERROR_OK)
 			{
-				command_print(cmd_ctx, "couldn't access reg %i", address);
+				command_print(cmd_ctx,
+						"couldn't access reg %" PRIi32,
+						address);
 				return ERROR_OK;
 			}
-			command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
+			command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+					address, value);
 		}
 	}
 
@@ -219,7 +225,7 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 int arm966e_register_commands(struct command_context *cmd_ctx)
 {
 	int retval;
-	command_t *arm966e_cmd;
+	struct command *arm966e_cmd;
 
 	retval = arm9tdmi_register_commands(cmd_ctx);
 	arm966e_cmd = register_command(cmd_ctx, NULL, "arm966e",
@@ -255,8 +261,9 @@ struct target_type arm966e_target =
 	.read_memory = arm7_9_read_memory,
 	.write_memory = arm7_9_write_memory,
 	.bulk_write_memory = arm7_9_bulk_write_memory,
-	.checksum_memory = arm7_9_checksum_memory,
-	.blank_check_memory = arm7_9_blank_check_memory,
+
+	.checksum_memory = arm_checksum_memory,
+	.blank_check_memory = arm_blank_check_memory,
 
 	.run_algorithm = armv4_5_run_algorithm,
 
@@ -268,5 +275,5 @@ struct target_type arm966e_target =
 	.register_commands = arm966e_register_commands,
 	.target_create = arm966e_target_create,
 	.init_target = arm9tdmi_init_target,
-	.examine = arm9tdmi_examine,
+	.examine = arm7_9_examine,
 };