X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=45aeb4ef1e6f1399e95773b08fd7218a68128573;hb=bbebfd9e134ec84a29dd68bc3661ead57435a4c3;hp=64641eaea141d6be08ea1e79b116ce09a566cca1;hpb=db7e77237c5a8104b527aeb23a2546b4bab92d8a;p=openocd.git

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 64641eaea1..45aeb4ef1e 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -27,14 +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_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);
+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 */