From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 16:42:20 +0000 (-0800)
Subject: embeddedice_reg_t -> struct embeddedice_reg
X-Git-Tag: v0.4.0-rc1~669
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2f7fc2921d5769799f1bd527b49a7a877b4c8fa0;p=openocd

embeddedice_reg_t -> struct embeddedice_reg

Remove misleading typedef and redundant suffix from struct embeddedice_reg.
---

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 893c39db..eb27bba0 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2609,7 +2609,7 @@ static int arm7_9_dcc_completion(struct target_s *target, uint32_t exit_point, i
 		embeddedice_write_reg(&arm7_9->eice_cache->reg_list[EICE_COMMS_DATA], fast_target_buffer_get_u32(buffer, little));
 		buffer += 4;
 
-		embeddedice_reg_t *ice_reg = arm7_9->eice_cache->reg_list[EICE_COMMS_DATA].arch_info;
+		struct embeddedice_reg *ice_reg = arm7_9->eice_cache->reg_list[EICE_COMMS_DATA].arch_info;
 		uint8_t reg_addr = ice_reg->addr & 0x1f;
 		struct jtag_tap *tap;
 		tap = ice_reg->jtag_info->tap;
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 3f0048e4..169ad2c3 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -169,7 +169,7 @@ embeddedice_build_reg_cache(target_t *target, struct arm7_9_common *arm7_9)
 	int retval;
 	reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t));
 	reg_t *reg_list = NULL;
-	embeddedice_reg_t *arch_info = NULL;
+	struct embeddedice_reg *arch_info = NULL;
 	struct arm_jtag *jtag_info = &arm7_9->jtag_info;
 	int num_regs = ARRAY_SIZE(eice_regs);
 	int i;
@@ -186,7 +186,7 @@ embeddedice_build_reg_cache(target_t *target, struct arm7_9_common *arm7_9)
 
 	/* the actual registers are kept in two arrays */
 	reg_list = calloc(num_regs, sizeof(reg_t));
-	arch_info = calloc(num_regs, sizeof(embeddedice_reg_t));
+	arch_info = calloc(num_regs, sizeof(struct embeddedice_reg));
 
 	/* fill in values for the reg cache */
 	reg_cache->name = "EmbeddedICE registers";
@@ -331,7 +331,7 @@ int embeddedice_setup(target_t *target)
 int embeddedice_read_reg_w_check(reg_t *reg,
 		uint8_t *check_value, uint8_t *check_mask)
 {
-	embeddedice_reg_t *ice_reg = reg->arch_info;
+	struct embeddedice_reg *ice_reg = reg->arch_info;
 	uint8_t reg_addr = ice_reg->addr & 0x1f;
 	struct scan_field fields[3];
 	uint8_t field1_out[1];
@@ -487,7 +487,7 @@ int embeddedice_set_reg_w_exec(reg_t *reg, uint8_t *buf)
  */
 void embeddedice_write_reg(reg_t *reg, uint32_t value)
 {
-	embeddedice_reg_t *ice_reg = reg->arch_info;
+	struct embeddedice_reg *ice_reg = reg->arch_info;
 
 	LOG_DEBUG("%i: 0x%8.8" PRIx32 "", ice_reg->addr, value);
 
diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 113a8fe9..eb2bb293 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -87,11 +87,11 @@ enum
 	EICE_COMM_CTRL_RBIT = 0
 };
 
-typedef struct embeddedice_reg_s
+struct embeddedice_reg
 {
 	int addr;
 	struct arm_jtag *jtag_info;
-} embeddedice_reg_t;
+};
 
 reg_cache_t* embeddedice_build_reg_cache(target_t *target,
 		struct arm7_9_common *arm7_9);