arm966e_common_t -> struct arm966e_common

Remove misleading typedef and redundant suffix from struct arm966e_common.

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index c752aea31bcac7a5af22f69de8625800809ca027..18e904e6d2e9ebfd4af98b51ccccbeac237a796d 100644 (file)
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,7 +32,7 @@
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct jtag_tap *tap)
+int arm966e_init_arch_info(target_t *target, struct arm966e_common *arm966e, struct jtag_tap *tap)
 {
        arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
        struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
@@ -52,13 +52,13 @@ int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct j
 
 static int arm966e_target_create(struct target_s *target, Jim_Interp *interp)
 {
-       arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
+       struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
 
        return arm966e_init_arch_info(target, arm966e, target->tap);
 }
 
 static int arm966e_verify_pointer(struct command_context_s *cmd_ctx,
-               struct arm966e_common_s *arm966e)
+               struct arm966e_common *arm966e)
 {
        if (arm966e->common_magic != ARM966E_COMMON_MAGIC) {
                command_print(cmd_ctx, "target is not an ARM966");
@@ -166,7 +166,7 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 {
        int retval;
        target_t *target = get_current_target(cmd_ctx);
-       struct arm966e_common_s *arm966e = target_to_arm966(target);
+       struct arm966e_common *arm966e = target_to_arm966(target);
 
        retval = arm966e_verify_pointer(cmd_ctx, arm966e);
        if (retval != ERROR_OK)

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index e311659f22b2ded2eaee8dfe09b6299cdf3e0efe..d8f9cc42de8dc3daf87394f47c1d902419223d34 100644 (file)
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -27,22 +27,22 @@
 
 #define        ARM966E_COMMON_MAGIC 0x20f920f9
 
-typedef struct arm966e_common_s
+struct arm966e_common
 {
        arm9tdmi_common_t arm9tdmi_common;
        int common_magic;
        uint32_t cp15_control_reg;
-} arm966e_common_t;
+};
 
-static inline struct arm966e_common_s *
+static inline struct arm966e_common *
 target_to_arm966(struct target_s *target)
 {
-       return container_of(target->arch_info, struct arm966e_common_s,
+       return container_of(target->arch_info, struct arm966e_common,
                        arm9tdmi_common.arm7_9_common.armv4_5_common);
 }
 
 int arm966e_init_arch_info(target_t *target,
-               arm966e_common_t *arm966e, struct jtag_tap *tap);
+               struct arm966e_common *arm966e, struct jtag_tap *tap);
 int arm966e_register_commands(struct command_context_s *cmd_ctx);
 int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
 

diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index 3026ed22c108bdb442e5eed9e2d25d4785cfb2a7..73c0e57ca8c7bfe5becd56eaae297ca111017e16 100644 (file)
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -632,7 +632,7 @@ int feroceon_target_create(struct target_s *target, Jim_Interp *interp)
 
 int dragonite_target_create(struct target_s *target, Jim_Interp *interp)
 {
-       arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
+       struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
 
        arm966e_init_arch_info(target, arm966e, target->tap);
        feroceon_common_setup(target);