X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm920t.c;h=fd61020de4bba9eab04cdd83183eff0471c3594f;hb=2280ddeea5fd82554696f1caa97f7a485a035da4;hp=577bf26e8ece1ec5f930a809676351e62fd8f5d9;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;p=openocd.git

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 577bf26e8e..fd61020de4 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -415,7 +415,7 @@ void arm920t_pre_restore_context(struct target *target)
 
 static const char arm920_not[] = "target is not an ARM920";
 
-static int arm920t_verify_pointer(struct command_context_s *cmd_ctx,
+static int arm920t_verify_pointer(struct command_context *cmd_ctx,
 		struct arm920t_common *arm920t)
 {
 	if (arm920t->common_magic != ARM920T_COMMON_MAGIC) {
@@ -1348,10 +1348,10 @@ static int arm920t_mcr(struct target *target, int cpnum, uint32_t op1, uint32_t
 }
 
 /** Registers commands to access coprocessor, cache, and MMU resources. */
-int arm920t_register_commands(struct command_context_s *cmd_ctx)
+int arm920t_register_commands(struct command_context *cmd_ctx)
 {
 	int retval;
-	command_t *arm920t_cmd;
+	struct command *arm920t_cmd;
 
 	retval = arm9tdmi_register_commands(cmd_ctx);
 
@@ -1407,8 +1407,9 @@ struct target_type arm920t_target =
 	.virt2phys = arm920_virt2phys,
 
 	.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,
 
@@ -1420,7 +1421,7 @@ struct target_type arm920t_target =
 	.register_commands = arm920t_register_commands,
 	.target_create = arm920t_target_create,
 	.init_target = arm9tdmi_init_target,
-	.examine = arm9tdmi_examine,
+	.examine = arm7_9_examine,
 	.mrc = arm920t_mrc,
 	.mcr = arm920t_mcr,
 };