arm9tdmi_common_t -> struct arm9tdmi_common

Remove misleading typedef and redundant suffix from struct arm9tdmi_common.

9 files changed, 13 insertions, 13 deletions

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 97545c50..22f7b630 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -622,7 +622,7 @@ int arm920t_soft_reset_halt(struct target_s *target)
 
 int arm920t_init_arch_info(target_t *target, struct arm920t_common *arm920t, struct jtag_tap *tap)
 {
-	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_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)
diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index b82c57b4..b2ab4598 100644
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -27,7 +27,7 @@
 
 struct arm920t_common
 {
-	arm9tdmi_common_t arm9tdmi_common;
+	struct arm9tdmi_common arm9tdmi_common;
 	uint32_t common_magic;
 	armv4_5_mmu_common_t armv4_5_mmu;
 	uint32_t cp15_control_reg;
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index b9d13e0b..9133bd9e 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -669,7 +669,7 @@ static int arm926ejs_read_phys_memory(struct target_s *target,
 int arm926ejs_init_arch_info(target_t *target, struct arm926ejs_common *arm926ejs,
 		struct jtag_tap *tap)
 {
-	arm9tdmi_common_t *arm9tdmi = &arm926ejs->arm9tdmi_common;
+	struct arm9tdmi_common *arm9tdmi = &arm926ejs->arm9tdmi_common;
 	struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
 
 	/* initialize arm9tdmi specific info (including arm7_9 and armv4_5)
diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 27320e6d..ec23f140 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -27,7 +27,7 @@
 
 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);
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 18e904e6..524c3625 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -34,7 +34,7 @@
 
 int arm966e_init_arch_info(target_t *target, struct arm966e_common *arm966e, struct jtag_tap *tap)
 {
-	arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
+	struct arm9tdmi_common *arm9tdmi = &arm966e->arm9tdmi_common;
 	struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
 
 	arm9tdmi_init_arch_info(target, arm9tdmi, tap);
diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index d8f9cc42..e6155b5c 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -29,7 +29,7 @@
 
 struct arm966e_common
 {
-	arm9tdmi_common_t arm9tdmi_common;
+	struct arm9tdmi_common arm9tdmi_common;
 	int common_magic;
 	uint32_t cp15_control_reg;
 };
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 7176ab37..985b7ff7 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -786,7 +786,7 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
+int arm9tdmi_init_arch_info(target_t *target, struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap)
 {
 	armv4_5_common_t *armv4_5;
 	struct arm7_9_common *arm7_9;
@@ -848,7 +848,7 @@ int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, struc
 
 static int arm9tdmi_target_create(struct target_s *target, Jim_Interp *interp)
 {
-	arm9tdmi_common_t *arm9tdmi = calloc(1,sizeof(arm9tdmi_common_t));
+	struct arm9tdmi_common *arm9tdmi = calloc(1,sizeof(struct arm9tdmi_common));
 
 	arm9tdmi_init_arch_info(target, arm9tdmi, target->tap);
 	arm9tdmi->arm7_9_common.armv4_5_common.is_armv4 = true;
diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index 85ed0296..61d1ccf5 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -28,10 +28,10 @@
 /* FIXME we don't really need a separate arm9tdmi struct any more...
  * remove it, the arm7/arm9 common struct suffices.
  */
-typedef struct arm9tdmi_common_s
+struct arm9tdmi_common
 {
 	struct arm7_9_common arm7_9_common;
-} arm9tdmi_common_t;
+};
 
 typedef struct arm9tdmi_vector_s
 {
@@ -55,7 +55,7 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
 		struct target_s *target);
 int arm9tdmi_examine(struct target_s *target);
 int arm9tdmi_init_arch_info(target_t *target,
-		arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap);
+		struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap);
 int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
 
 int arm9tdmi_clock_out(arm_jtag_t *jtag_info,
diff --git a/src/target/fa526.c b/src/target/fa526.c
index 95999b36..4aa5e3ab 100644
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -256,7 +256,7 @@ static void fa526_branch_resume_thumb(target_t *target)
 }
 
 static int fa526_init_arch_info_2(target_t *target,
-		arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
+		struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap)
 {
 	struct arm7_9_common *arm7_9;
 
@@ -317,7 +317,7 @@ static int fa526_init_arch_info_2(target_t *target,
 static int fa526_init_arch_info(target_t *target,
 		struct arm920t_common *arm920t, struct jtag_tap *tap)
 {
-	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_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)