X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm920t.h;h=9a837b52852e82409bf1d9b4aad0279af383fb95;hp=ed851a9385513c861cb3af0972227dc0cc2575be;hb=b174a0d75ec81fbcd075c8c8d7f915e4a3d76bc3;hpb=aab023570b7cc8f884715fc6a8af9c296d24ea8e

diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index ed851a9385..9a837b5285 100644
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -25,24 +25,31 @@
 
 #define	ARM920T_COMMON_MAGIC 0xa920a920
 
-typedef struct arm920t_common_s
+struct arm920t_common
 {
+	arm9tdmi_common_t arm9tdmi_common;
 	uint32_t common_magic;
 	armv4_5_mmu_common_t armv4_5_mmu;
-	arm9tdmi_common_t arm9tdmi_common;
 	uint32_t cp15_control_reg;
 	uint32_t d_fsr;
 	uint32_t i_fsr;
 	uint32_t d_far;
 	uint32_t i_far;
 	int preserve_cache;
-} arm920t_common_t;
+};
+
+static inline struct arm920t_common *
+target_to_arm920(struct target_s *target)
+{
+	return container_of(target->arch_info, struct arm920t_common,
+			arm9tdmi_common.arm7_9_common.armv4_5_common);
+}
 
-typedef struct arm920t_cache_line_s
+struct arm920t_cache_line
 {
 	uint32_t cam;
 	uint32_t data[8];
-} arm920t_cache_line_t;
+};
 
 typedef struct arm920t_tlb_entry_s
 {