mips_ejtag_t -> struct mips_ejtag

[fw/openocd] / src / target / arm926ejs.h

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 7adbf1fbd311f9c665f5c35806c7268b97bc5b61..171c58909bfb2cca47aa0ae9dc11f7cfde46c02c 100644 (file)
--- 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 arm9tdmi_common arm9tdmi_common;
        uint32_t common_magic;
-       armv4_5_mmu_common_t armv4_5_mmu;
-       arm9tdmi_common_t arm9tdmi_common;
+       struct armv4_5_mmu_common armv4_5_mmu;
        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);
        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_s *target)
+{
+       return container_of(target->arch_info, struct arm926ejs_common,
+               arm9tdmi_common.arm7_9_common.armv4_5_common);
+}
+
+
+int arm926ejs_init_arch_info(target_t *target,
+               struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
+int arm926ejs_register_commands(struct command_context_s *cmd_ctx);
+int arm926ejs_arch_state(struct target_s *target);
+int arm926ejs_write_memory(struct target_s *target,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+int arm926ejs_soft_reset_halt(struct target_s *target);
 
 #endif /* ARM926EJS_H */