arm7tdmi_common_t -> struct arm7tdmi_common

Remove misleading typedef and redundant suffix from struct arm7tdmi_common.

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index d9d31daa2c8688a47a1f198371c4ebfa73c2c37d..a6641d0932203184415de934c25ecbd5070a8c70 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -379,7 +379,7 @@ static int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_
 static int arm720t_init_arch_info(target_t *target,
                struct arm720t_common *arm720t, struct jtag_tap *tap)
 {
-       arm7tdmi_common_t *arm7tdmi = &arm720t->arm7tdmi_common;
+       struct arm7tdmi_common *arm7tdmi = &arm720t->arm7tdmi_common;
        struct arm7_9_common *arm7_9 = &arm7tdmi->arm7_9_common;
 
        arm7tdmi_init_arch_info(target, arm7tdmi, tap);

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index 25c682a0d385099d912d5419039ea78273a78690..c5e2809126a157710f9a31176a44f2457154af0e 100644 (file)
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -27,7 +27,7 @@
 
 struct arm720t_common
 {
-       arm7tdmi_common_t arm7tdmi_common;
+       struct arm7tdmi_common arm7tdmi_common;
        uint32_t common_magic;
        armv4_5_mmu_common_t armv4_5_mmu;
        uint32_t cp15_control_reg;

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 6644726ac8acfaa85b2363b02cf7777874786647..2614d9e42100740f75194de9494426a903627716 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -691,7 +691,7 @@ int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
        return ERROR_OK;
 }
 
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap)
+int arm7tdmi_init_arch_info(target_t *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap)
 {
        struct arm7_9_common *arm7_9 = &arm7tdmi->arm7_9_common;
 
@@ -743,9 +743,9 @@ int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struc
 
 static int arm7tdmi_target_create(struct target_s *target, Jim_Interp *interp)
 {
-       arm7tdmi_common_t *arm7tdmi;
+       struct arm7tdmi_common *arm7tdmi;
 
-       arm7tdmi = calloc(1,sizeof(arm7tdmi_common_t));
+       arm7tdmi = calloc(1,sizeof(struct arm7tdmi_common));
        arm7tdmi_init_arch_info(target, arm7tdmi, target->tap);
        arm7tdmi->arm7_9_common.armv4_5_common.is_armv4 = true;
 

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index b6996973921780bf8817b36f8c026028f42ac834..4faec180cc4edafa5e268b97c8827f11339dca71 100644 (file)
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -28,12 +28,12 @@
 /* FIXME we don't really need a separate arm7tdmi struct any more...
  * remove it, the arm7/arm9 common struct suffices.
  */
-typedef struct arm7tdmi_common_s
+struct arm7tdmi_common
 {
        struct arm7_9_common arm7_9_common;
-} arm7tdmi_common_t;
+};
 
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap);
+int arm7tdmi_init_arch_info(target_t *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap);
 int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm7tdmi_examine(struct target_s *target);