X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm720t.h;h=f0ab44477642ea6b8a385f1f0e39da82beefb9ac;hb=ec93209f51afc09e273a4742dc0b5f2cefc15e76;hp=0689e4442157a4097bd999086ac833a8d7154d5c;hpb=db116b1ea3c77a3c5850fccbce9e0795faa21dda;p=openocd.git

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index 0689e44421..f0ab444776 100644
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -25,21 +25,21 @@
 
 #define	ARM720T_COMMON_MAGIC 0xa720a720
 
-typedef struct arm720t_common_s
+struct arm720t_common
 {
+	struct arm7_9_common arm7_9_common;
 	uint32_t common_magic;
-	armv4_5_mmu_common_t armv4_5_mmu;
-	arm7tdmi_common_t arm7tdmi_common;
+	struct armv4_5_mmu_common armv4_5_mmu;
 	uint32_t cp15_control_reg;
 	uint32_t fsr_reg;
 	uint32_t far_reg;
-} arm720t_common_t;
+};
 
-static inline struct arm720t_common_s *
-target_to_arm720(struct target_s *target)
+static inline struct arm720t_common *
+target_to_arm720(struct target *target)
 {
-	return container_of(target->arch_info, struct arm720t_common_s,
-			arm7tdmi_common.arm7_9_common.armv4_5_common);
+	return container_of(target->arch_info, struct arm720t_common,
+			arm7_9_common.armv4_5_common);
 }
 
 #endif /* ARM720T_H */