X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=d8f9cc42de8dc3daf87394f47c1d902419223d34;hp=c7a5b1bba18aad6660fa38aedf2fe08c4ee52d11;hb=1ad4ee2deb5a888cb9f9b825a0e4fbfa68aa1218;hpb=00e900f8a1dff8d0aeacc8cdded995e0abae37c5

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index c7a5b1bba1..d8f9cc42de 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -27,16 +27,23 @@
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9
 
-typedef struct arm966e_common_s
+struct arm966e_common
 {
-	int common_magic;
 	arm9tdmi_common_t arm9tdmi_common;
+	int common_magic;
 	uint32_t cp15_control_reg;
-} arm966e_common_t;
+};
+
+static inline struct arm966e_common *
+target_to_arm966(struct target_s *target)
+{
+	return container_of(target->arch_info, struct arm966e_common,
+			arm9tdmi_common.arm7_9_common.armv4_5_common);
+}
 
-extern int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap);
-extern int arm966e_register_commands(struct command_context_s *cmd_ctx);
-extern int arm966e_read_cp15(target_t *target, int reg_addr, uint32_t *value);
-extern int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
+int arm966e_init_arch_info(target_t *target,
+		struct arm966e_common *arm966e, struct jtag_tap *tap);
+int arm966e_register_commands(struct command_context_s *cmd_ctx);
+int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
 
 #endif /* ARM966E_H */