X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=22081f4e63511660aecab08f82d2d4d27a737ad3;hp=f0df09138ab5620d6a4045e97327a3cb8e00b91e;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=42ef503d37b18d907da16d26e99167566d5aabd1

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index f0df09138a..22081f4e63 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -25,33 +25,33 @@
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 
-typedef struct arm926ejs_common_s
+struct arm926ejs_common
 {
-	arm9tdmi_common_t arm9tdmi_common;
+	struct arm9tdmi_common arm9tdmi_common;
 	uint32_t common_magic;
-	armv4_5_mmu_common_t 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);
+	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;
+};
 
-static inline struct arm926ejs_common_s *
-target_to_arm926(struct target_s *target)
+static inline struct arm926ejs_common *
+target_to_arm926(struct target *target)
 {
-	return container_of(target->arch_info, struct arm926ejs_common_s,
+	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,
-		arm926ejs_common_t *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,
+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_s *target);
+int arm926ejs_soft_reset_halt(struct target *target);
 
 #endif /* ARM926EJS_H */