X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=45aeb4ef1e6f1399e95773b08fd7218a68128573;hp=21dee1e5453c760d92eb36c3e13bd2328fe28055;hb=ec93209f51afc09e273a4742dc0b5f2cefc15e76;hpb=20ff0a9682090912e84cc5c80be92b1e0ea78216

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 21dee1e545..45aeb4ef1e 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -27,15 +27,23 @@
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9
 
-typedef struct arm966e_common_s
+struct arm966e_common
 {
+	struct arm7_9_common arm7_9_common;
 	int common_magic;
-	arm9tdmi_common_t arm9tdmi_common;
 	uint32_t cp15_control_reg;
-} arm966e_common_t;
+};
 
-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_write_cp15(target_t *target, int reg_addr, uint32_t value);
+static inline struct arm966e_common *
+target_to_arm966(struct target *target)
+{
+	return container_of(target->arch_info, struct arm966e_common,
+			arm7_9_common.armv4_5_common);
+}
+
+int arm966e_init_arch_info(struct target *target,
+		struct arm966e_common *arm966e, struct jtag_tap *tap);
+int arm966e_register_commands(struct command_context *cmd_ctx);
+int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
 
 #endif /* ARM966E_H */