X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=e2a53a6b05da8c6c3e49228680d76aa69597ea09;hp=cdd989d52d49f4a7302f45ebe41738ba4043307b;hb=b48d1f66378fac886d5bc32d7302da48c89d8a75;hpb=86173cdbddde781b19ac630602f2d450a59b32b5

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index cdd989d52d..e2a53a6b05 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -25,23 +25,34 @@
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 
-typedef struct arm926ejs_common_s
+struct arm926ejs_common
 {
-	u32 common_magic;
-	armv4_5_mmu_common_t armv4_5_mmu;
-	arm9tdmi_common_t arm9tdmi_common;
-	int (*read_cp15)(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32 *value);
-	int (*write_cp15)(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32 value);
-	u32 cp15_control_reg;
-	u32 d_fsr;
-	u32 i_fsr;
-	u32 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, u32 address, u32 size, u32 count, uint8_t *buffer); 
-extern int arm926ejs_soft_reset_halt(struct target_s *target);
+	struct arm7_9_common arm7_9_common;
+	uint32_t common_magic;
+	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;
+};
+
+static inline struct arm926ejs_common *
+target_to_arm926(struct target *target)
+{
+	return container_of(target->arch_info, struct arm926ejs_common,
+			arm7_9_common.arm);
+}
+
+
+int arm926ejs_init_arch_info(struct target *target,
+		struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
+int arm926ejs_arch_state(struct target *target);
+int arm926ejs_write_memory(struct target *target,
+		uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
+int arm926ejs_soft_reset_halt(struct target *target);
+
+extern const struct command_registration arm926ejs_command_handlers[];
 
 #endif /* ARM926EJS_H */