X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm720t.c;h=3bac0beb93667292872a0764be27394fc65638b4;hp=eb66b120c2c358e1cd3eb9b49960a84bf0e748d1;hb=812ab89f58f43979a402ecf4bef7f09f84695cc6;hpb=aafb916bea1153b8d2f4706e4a62628f49741133

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index eb66b120c2..3bac0beb93 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -27,6 +27,7 @@
 #include "arm720t.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*
@@ -48,7 +49,7 @@ static int arm720t_scan_cp15(struct target *target,
 	uint8_t out_buf[4];
 	uint8_t instruction_buf = instruction;
 
-	jtag_info = &arm720t->arm7tdmi_common.arm7_9_common.jtag_info;
+	jtag_info = &arm720t->arm7_9_common.jtag_info;
 
 	buf_set_u32(out_buf, 0, 32, flip_u32(out, 32));
 
@@ -231,7 +232,7 @@ static int arm720t_arch_state(struct target *target)
 		"disabled", "enabled"
 	};
 
-	armv4_5 = &arm720t->arm7tdmi_common.arm7_9_common.armv4_5_common;
+	armv4_5 = &arm720t->arm7_9_common.armv4_5_common;
 
 	LOG_USER("target halted in %s state due to %s, current mode: %s\n"
 			"cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
@@ -304,10 +305,10 @@ static int arm720t_soft_reset_halt(struct target *target)
 {
 	int retval = ERROR_OK;
 	struct arm720t_common *arm720t = target_to_arm720(target);
-	struct reg *dbg_stat = &arm720t->arm7tdmi_common.arm7_9_common
+	struct reg *dbg_stat = &arm720t->arm7_9_common
 			.eice_cache->reg_list[EICE_DBG_STAT];
-	struct armv4_5_common_s *armv4_5 = &arm720t->arm7tdmi_common
-			.arm7_9_common.armv4_5_common;
+	struct armv4_5_common_s *armv4_5 = &arm720t->arm7_9_common
+			.armv4_5_common;
 
 	if ((retval = target_halt(target)) != ERROR_OK)
 	{
@@ -379,10 +380,9 @@ static int arm720t_init_target(struct command_context *cmd_ctx, struct target *t
 static int arm720t_init_arch_info(struct target *target,
 		struct arm720t_common *arm720t, struct jtag_tap *tap)
 {
-	struct arm7tdmi_common *arm7tdmi = &arm720t->arm7tdmi_common;
-	struct arm7_9_common *arm7_9 = &arm7tdmi->arm7_9_common;
+	struct arm7_9_common *arm7_9 = &arm720t->arm7_9_common;
 
-	arm7tdmi_init_arch_info(target, arm7tdmi, tap);
+	arm7tdmi_init_arch_info(target, arm7_9, tap);
 
 	arm720t->common_magic = ARM720T_COMMON_MAGIC;
 
@@ -405,7 +405,7 @@ static int arm720t_target_create(struct target *target, Jim_Interp *interp)
 {
 	struct arm720t_common *arm720t = calloc(1, sizeof(*arm720t));
 
-	arm720t->arm7tdmi_common.arm7_9_common.armv4_5_common.is_armv4 = true;
+	arm720t->arm7_9_common.armv4_5_common.is_armv4 = true;
 	return arm720t_init_arch_info(target, arm720t, target->tap);
 }
 
@@ -420,7 +420,7 @@ COMMAND_HANDLER(arm720t_handle_cp15_command)
 	if (retval != ERROR_OK)
 		return retval;
 
-	jtag_info = &arm720t->arm7tdmi_common.arm7_9_common.jtag_info;
+	jtag_info = &arm720t->arm7_9_common.jtag_info;
 
 	if (target->state != TARGET_HALTED)
 	{
@@ -535,8 +535,9 @@ struct target_type arm720t_target =
 	.virt2phys = arm720_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,