X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.c;h=f305390b28624cd09e69edaf11f5e3486c6e73cc;hb=47f2305229486f14eed948025c21c6ab73471d4e;hp=b2f246f90f6a36b2d6dad86d78508a8b8c23b16c;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;p=openocd.git

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index b2f246f90f..f305390b28 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -27,6 +27,7 @@
 #include "arm926ejs.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*
@@ -474,7 +475,7 @@ static void arm926ejs_pre_restore_context(struct target *target)
 
 static const char arm926_not[] = "target is not an ARM926";
 
-static int arm926ejs_verify_pointer(struct command_context_s *cmd_ctx,
+static int arm926ejs_verify_pointer(struct command_context *cmd_ctx,
 		struct arm926ejs_common *arm926)
 {
 	if (arm926->common_magic != ARM926EJS_COMMON_MAGIC) {
@@ -818,10 +819,10 @@ static int arm926ejs_mmu(struct target *target, int *enabled)
 }
 
 /** Registers commands to access coprocessor, cache, and debug resources.  */
-int arm926ejs_register_commands(struct command_context_s *cmd_ctx)
+int arm926ejs_register_commands(struct command_context *cmd_ctx)
 {
 	int retval;
-	command_t *arm926ejs_cmd;
+	struct command *arm926ejs_cmd;
 
 	retval = arm9tdmi_register_commands(cmd_ctx);
 
@@ -864,8 +865,9 @@ struct target_type arm926ejs_target =
 	.read_memory = arm7_9_read_memory,
 	.write_memory = arm926ejs_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,
 
@@ -877,7 +879,7 @@ struct target_type arm926ejs_target =
 	.register_commands = arm926ejs_register_commands,
 	.target_create = arm926ejs_target_create,
 	.init_target = arm9tdmi_init_target,
-	.examine = arm9tdmi_examine,
+	.examine = arm7_9_examine,
 	.virt2phys = arm926ejs_virt2phys,
 	.mmu = arm926ejs_mmu,