X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=171c58909bfb2cca47aa0ae9dc11f7cfde46c02c;hb=abd7b404086d3c63b163a5ffa786f3538714b7d9;hp=178fc2298e9d18c7c6ce815dec970006967cd43b;hpb=1aa854684de1827edd3b605fc64a78a498f2358a;p=openocd.git

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 178fc2298e..171c58909b 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -20,33 +20,38 @@
 #ifndef ARM926EJS_H
 #define ARM926EJS_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 
-typedef struct arm926ejs_common_s
+struct arm926ejs_common
 {
-	int 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;
+	struct arm9tdmi_common arm9tdmi_common;
+	uint32_t common_magic;
+	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;
+};
 
-extern int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs, int chain_pos, char *variant);
-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, u8 *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 */