armv4_5_cache_common_t -> struct armv4_5_cache_common

Remove misleading typedef and redundant suffix from struct armv4_5_cache_common.

diff --git a/src/target/armv4_5_cache.c b/src/target/armv4_5_cache.c
index f45878a697557a65f2577e0d1c07dd3fae3a2cb9..793979e51d99cc3108032e0cd7a061f36569fadd 100644 (file)
--- a/src/target/armv4_5_cache.c
+++ b/src/target/armv4_5_cache.c
@@ -24,7 +24,7 @@
 #include "armv4_5_cache.h"
 #include "log.h"
 
-int armv4_5_identify_cache(uint32_t cache_type_reg, armv4_5_cache_common_t *cache)
+int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common *cache)
 {
        int size, assoc, M, len, multiplier;
 
@@ -87,7 +87,7 @@ int armv4_5_identify_cache(uint32_t cache_type_reg, armv4_5_cache_common_t *cach
        return ERROR_OK;
 }
 
-int armv4_5_handle_cache_info_command(struct command_context_s *cmd_ctx, armv4_5_cache_common_t *armv4_5_cache)
+int armv4_5_handle_cache_info_command(struct command_context_s *cmd_ctx, struct armv4_5_cache_common *armv4_5_cache)
 {
        if (armv4_5_cache->ctype == -1)
        {

diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h
index 9a06090d777be6f43b6f5e2cd9cd0785356da6a8..456a32d3711b6791e33062fe48490c45cebebd59 100644 (file)
--- a/src/target/armv4_5_cache.h
+++ b/src/target/armv4_5_cache.h
@@ -32,7 +32,7 @@ struct armv4_5_cachesize
        int cachesize;
 };
 
-typedef struct armv4_5_cache_common_s
+struct armv4_5_cache_common
 {
        int ctype;      /* specify supported cache operations */
        int separate;   /* separate caches or unified cache */
@@ -40,15 +40,15 @@ typedef struct armv4_5_cache_common_s
        struct armv4_5_cachesize i_size; /* instruction cache */
        int i_cache_enabled;
        int d_u_cache_enabled;
-} armv4_5_cache_common_t;
+};
 
 int armv4_5_identify_cache(uint32_t cache_type_reg,
-               armv4_5_cache_common_t *cache);
+               struct armv4_5_cache_common *cache);
 int armv4_5_cache_state(uint32_t cp15_control_reg,
-               armv4_5_cache_common_t *cache);
+               struct armv4_5_cache_common *cache);
 
 int armv4_5_handle_cache_info_command(struct command_context_s *cmd_ctx,
-               armv4_5_cache_common_t *armv4_5_cache);
+               struct armv4_5_cache_common *armv4_5_cache);
 
 enum
 {

diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h
index b0c39a7a39a4a6da050677a1a77e243435f8b5e3..b8ad0c8bc4a9b1686b3c12d220e47639cd36a74a 100644 (file)
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -30,7 +30,7 @@ typedef struct armv4_5_mmu_common_s
        int (*write_memory)(target_t *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
        void (*disable_mmu_caches)(target_t *target, int mmu, int d_u_cache, int i_cache);
        void (*enable_mmu_caches)(target_t *target, int mmu, int d_u_cache, int i_cache);
-       armv4_5_cache_common_t armv4_5_cache;
+       struct armv4_5_cache_common armv4_5_cache;
        int has_tiny_pages;
        int mmu_enabled;
 } armv4_5_mmu_common_t;