arm9tdmi_common_t -> struct arm9tdmi_common

Remove misleading typedef and redundant suffix from struct arm9tdmi_common.

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 97545c5082bd8cade708f9b0afe7b02e42f7de13..22f7b6309d9e798ff769be0b45498362651d9aaf 100644 (file)
--- 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 b82c57b4e149cc13898b73d91d5010db03ae6da6..b2ab45983b9b28f2b0344b4ac9ba10fcb3fc0be3 100644 (file)
--- 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 b9d13e0bf00d16c54bd97f8cb185e5c8b8e51d19..9133bd9e905201948082d5c6c008852d601a9fbb 100644 (file)
--- 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 27320e6d92bb97e6e904049620276836512156f9..ec23f1406c96aeb5ec628473d04f7a3c23afe2f8 100644 (file)
--- 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 18e904e6d2e9ebfd4af98b51ccccbeac237a796d..524c3625f15896434b9fcb83a99d74e978318024 100644 (file)
--- 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 d8f9cc42de8dc3daf87394f47c1d902419223d34..e6155b5c34aaa385706052a1e825da6cb3acf52c 100644 (file)
--- 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 7176ab377d30b10b0559a1231893fbfa81a6fb8d..985b7ff7cc61803c6b53400966892dc3f93bf1de 100644 (file)
--- 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 85ed02965df04bf86bd434c9d52a4260bc301567..61d1ccf53c82b7fbd7608773801849ab91874d76 100644 (file)
--- 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 95999b3691d430567b2506df4795d5d55036a31b..4aa5e3ab829e8253fd21199c65b2dbc93bd2d6bf 100644 (file)
--- 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)