X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=514f054376592729af95d49ad6f670d1d5398c71;hp=6bb2a2e4f5f5e2ea9f8ba6bbb69f88e96066ec5d;hb=0181296f61f11e4390e5a381906021db4ddd4bcd;hpb=db7e77237c5a8104b527aeb23a2546b4bab92d8a

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 6bb2a2e4f5..514f054376 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -25,23 +25,33 @@
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 
-typedef struct arm926ejs_common_s
+struct arm926ejs_common
 {
+	struct arm7_9_common arm7_9_common;
 	uint32_t common_magic;
-	armv4_5_mmu_common_t armv4_5_mmu;
-	arm9tdmi_common_t arm9tdmi_common;
-	int (*read_cp15)(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
-	int (*write_cp15)(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value);
+	struct armv4_5_mmu_common armv4_5_mmu;
+	int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
+	int (*write_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value);
 	uint32_t cp15_control_reg;
 	uint32_t d_fsr;
 	uint32_t i_fsr;
 	uint32_t d_far;
-} arm926ejs_common_t;
+};
 
-extern int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs, jtag_tap_t *tap);
-extern int arm926ejs_register_commands(struct command_context_s *cmd_ctx); 
-extern int arm926ejs_arch_state(struct target_s *target); 
-extern int arm926ejs_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); 
-extern int arm926ejs_soft_reset_halt(struct target_s *target);
+static inline struct arm926ejs_common *
+target_to_arm926(struct target *target)
+{
+	return container_of(target->arch_info, struct arm926ejs_common,
+			arm7_9_common.armv4_5_common);
+}
+
+
+int arm926ejs_init_arch_info(struct target *target,
+		struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
+int arm926ejs_register_commands(struct command_context *cmd_ctx);
+int arm926ejs_arch_state(struct target *target);
+int arm926ejs_write_memory(struct target *target,
+		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+int arm926ejs_soft_reset_halt(struct target *target);
 
 #endif /* ARM926EJS_H */