X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ffa526.c;h=f3df24fe1ec1742c842632970121aad027d82d01;hp=459293428a721e687dfa6b2b3f996265f904fa10;hb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;hpb=42ef503d37b18d907da16d26e99167566d5aabd1

diff --git a/src/target/fa526.c b/src/target/fa526.c
index 459293428a..f3df24fe1e 100644
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -34,17 +34,17 @@
 #include "arm920t.h"
 #include "target_type.h"
 
-static void fa526_change_to_arm(target_t *target, uint32_t *r0, uint32_t *pc)
+static void fa526_change_to_arm(struct target *target, uint32_t *r0, uint32_t *pc)
 {
 	LOG_ERROR("%s: there is no Thumb state on FA526", __func__);
 }
 
-static void fa526_read_core_regs(target_t *target,
+static void fa526_read_core_regs(struct target *target,
 		uint32_t mask, uint32_t* core_regs[16])
 {
 	int i;
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
 	/* STMIA r0-15, [r0] at debug speed
 	 * register values will start to appear on 4th DCLK
@@ -66,12 +66,12 @@ static void fa526_read_core_regs(target_t *target,
 	}
 }
 
-static void fa526_read_core_regs_target_buffer(target_t *target,
+static void fa526_read_core_regs_target_buffer(struct target *target,
 		uint32_t mask, void* buffer, int size)
 {
 	int i;
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 	int be = (target->endianness == TARGET_BIG_ENDIAN) ? 1 : 0;
 	uint32_t *buf_u32 = buffer;
 	uint16_t *buf_u16 = buffer;
@@ -108,10 +108,10 @@ static void fa526_read_core_regs_target_buffer(target_t *target,
 	}
 }
 
-static void fa526_read_xpsr(target_t *target, uint32_t *xpsr, int spsr)
+static void fa526_read_xpsr(struct target *target, uint32_t *xpsr, int spsr)
 {
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
 	/* MRS r0, cpsr */
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_MRS(0, spsr & 1), 0, NULL, 0);
@@ -133,10 +133,10 @@ static void fa526_read_xpsr(target_t *target, uint32_t *xpsr, int spsr)
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, xpsr, 0);
 }
 
-static void fa526_write_xpsr(target_t *target, uint32_t xpsr, int spsr)
+static void fa526_write_xpsr(struct target *target, uint32_t xpsr, int spsr)
 {
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
 	LOG_DEBUG("xpsr: %8.8" PRIx32 ", spsr: %i", xpsr, spsr);
 
@@ -169,11 +169,11 @@ static void fa526_write_xpsr(target_t *target, uint32_t xpsr, int spsr)
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-static void fa526_write_xpsr_im8(target_t *target,
+static void fa526_write_xpsr_im8(struct target *target,
 		uint8_t xpsr_im, int rot, int spsr)
 {
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
 	LOG_DEBUG("xpsr_im: %2.2x, rot: %i, spsr: %i", xpsr_im, rot, spsr);
 
@@ -196,12 +196,12 @@ static void fa526_write_xpsr_im8(target_t *target,
 	}
 }
 
-static void fa526_write_core_regs(target_t *target,
+static void fa526_write_core_regs(struct target *target,
 		uint32_t mask, uint32_t core_regs[16])
 {
 	int i;
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
 	/* LDMIA r0-15, [r0] at debug speed
 	* register values will start to appear on 4th DCLK
@@ -224,10 +224,10 @@ static void fa526_write_core_regs(target_t *target,
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-static void fa526_write_pc(target_t *target, uint32_t pc)
+static void fa526_write_pc(struct target *target, uint32_t pc)
 {
-	struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
-	arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
+	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 
 	/* LDMIA r0-15, [r0] at debug speed
 	 * register values will start to appear on 4th DCLK
@@ -250,15 +250,15 @@ static void fa526_write_pc(target_t *target, uint32_t pc)
 	arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
 }
 
-static void fa526_branch_resume_thumb(target_t *target)
+static void fa526_branch_resume_thumb(struct target *target)
 {
 	LOG_ERROR("%s: there is no Thumb state on FA526", __func__);
 }
 
-static int fa526_init_arch_info_2(target_t *target,
-		arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
+static int fa526_init_arch_info_2(struct target *target,
+		struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap)
 {
-	arm7_9_common_t *arm7_9;
+	struct arm7_9_common *arm7_9;
 
 	arm7_9 = &arm9tdmi->arm7_9_common;
 
@@ -314,11 +314,11 @@ static int fa526_init_arch_info_2(target_t *target,
 	return ERROR_OK;
 }
 
-static int fa526_init_arch_info(target_t *target,
-		arm920t_common_t *arm920t, struct jtag_tap *tap)
+static int fa526_init_arch_info(struct target *target,
+		struct arm920t_common *arm920t, struct jtag_tap *tap)
 {
-	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
-	arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;
+	struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common;
+	struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
 
 	/* initialize arm9tdmi specific info (including arm7_9 and armv4_5)
 	 */
@@ -350,15 +350,15 @@ static int fa526_init_arch_info(target_t *target,
 	return ERROR_OK;
 }
 
-static int fa526_target_create(struct target_s *target, Jim_Interp *interp)
+static int fa526_target_create(struct target *target, Jim_Interp *interp)
 {
-	arm920t_common_t *arm920t = calloc(1,sizeof(arm920t_common_t));
+	struct arm920t_common *arm920t = calloc(1,sizeof(struct arm920t_common));
 
 	return fa526_init_arch_info(target, arm920t, target->tap);
 }
 
 /** Holds methods for FA526 targets. */
-target_type_t fa526_target =
+struct target_type fa526_target =
 {
 	.name = "fa526",