From f6dae0cf84de26846a18f3fcaea842ccd898a5c1 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 08:41:27 -0800 Subject: [PATCH] armv4_5_mmu_common_t -> struct armv4_5_mmu_common Remove misleading typedef and redundant suffix from struct armv4_5_mmu_common. --- src/target/arm720t.h | 2 +- src/target/arm920t.h | 2 +- src/target/arm926ejs.h | 2 +- src/target/armv4_5_mmu.c | 8 ++++---- src/target/armv4_5_mmu.h | 10 +++++----- src/target/armv7a.h | 2 +- src/target/xscale.h | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/target/arm720t.h b/src/target/arm720t.h index c5e2809126..ab9aef6ab5 100644 --- a/src/target/arm720t.h +++ b/src/target/arm720t.h @@ -29,7 +29,7 @@ struct arm720t_common { struct arm7tdmi_common arm7tdmi_common; uint32_t common_magic; - armv4_5_mmu_common_t armv4_5_mmu; + struct armv4_5_mmu_common armv4_5_mmu; uint32_t cp15_control_reg; uint32_t fsr_reg; uint32_t far_reg; diff --git a/src/target/arm920t.h b/src/target/arm920t.h index b2ab45983b..4bd5cebbc9 100644 --- a/src/target/arm920t.h +++ b/src/target/arm920t.h @@ -29,7 +29,7 @@ struct arm920t_common { struct arm9tdmi_common arm9tdmi_common; uint32_t common_magic; - armv4_5_mmu_common_t armv4_5_mmu; + struct armv4_5_mmu_common armv4_5_mmu; uint32_t cp15_control_reg; uint32_t d_fsr; uint32_t i_fsr; diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h index ec23f1406c..171c58909b 100644 --- a/src/target/arm926ejs.h +++ b/src/target/arm926ejs.h @@ -29,7 +29,7 @@ struct arm926ejs_common { struct arm9tdmi_common arm9tdmi_common; uint32_t common_magic; - armv4_5_mmu_common_t armv4_5_mmu; + struct armv4_5_mmu_common armv4_5_mmu; int (*read_cp15)(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value); int (*write_cp15)(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value); uint32_t cp15_control_reg; diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c index 4088fd22cd..64147e8709 100644 --- a/src/target/armv4_5_mmu.c +++ b/src/target/armv4_5_mmu.c @@ -25,14 +25,14 @@ #include "armv4_5_mmu.h" -uint32_t armv4mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap); +uint32_t armv4mmu_translate_va(target_t *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap); char* armv4_5_mmu_page_type_names[] = { "section", "large page", "small page", "tiny page" }; -uint32_t armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap) +uint32_t armv4_5_mmu_translate_va(target_t *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap) { uint32_t first_lvl_descriptor = 0x0; uint32_t second_lvl_descriptor = 0x0; @@ -130,7 +130,7 @@ uint32_t armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_ return ERROR_TARGET_TRANSLATION_FAULT; } -int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) +int armv4_5_mmu_read_physical(target_t *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { int retval; @@ -150,7 +150,7 @@ int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mm return retval; } -int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) +int armv4_5_mmu_write_physical(target_t *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { int retval; diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h index b8ad0c8bc4..4357c92ffd 100644 --- a/src/target/armv4_5_mmu.h +++ b/src/target/armv4_5_mmu.h @@ -23,7 +23,7 @@ #include "armv4_5_cache.h" #include "target.h" -typedef struct armv4_5_mmu_common_s +struct armv4_5_mmu_common { uint32_t (*get_ttb)(target_t *target); int (*read_memory)(target_t *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); @@ -33,7 +33,7 @@ typedef struct armv4_5_mmu_common_s struct armv4_5_cache_common armv4_5_cache; int has_tiny_pages; int mmu_enabled; -} armv4_5_mmu_common_t; +}; enum { @@ -43,15 +43,15 @@ enum extern char* armv4_5_page_type_names[]; uint32_t armv4_5_mmu_translate_va(target_t *target, - armv4_5_mmu_common_t *armv4_5_mmu, uint32_t va, int *type, + struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap); int armv4_5_mmu_read_physical(target_t *target, - armv4_5_mmu_common_t *armv4_5_mmu, + struct armv4_5_mmu_common *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); int armv4_5_mmu_write_physical(target_t *target, - armv4_5_mmu_common_t *armv4_5_mmu, + struct armv4_5_mmu_common *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); enum diff --git a/src/target/armv7a.h b/src/target/armv7a.h index e7a7fc2506..b12c62c18e 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -105,7 +105,7 @@ typedef struct armv7a_common_s uint8_t memory_ap; /* Cache and Memory Management Unit */ - armv4_5_mmu_common_t armv4_5_mmu; + struct armv4_5_mmu_common armv4_5_mmu; armv4_5_common_t armv4_5_common; // int (*full_context)(struct target_s *target); diff --git a/src/target/xscale.h b/src/target/xscale.h index 433ecfcf03..dd7b034652 100644 --- a/src/target/xscale.h +++ b/src/target/xscale.h @@ -125,7 +125,7 @@ typedef struct xscale_common_s int arch_debug_reason; /* MMU/Caches */ - armv4_5_mmu_common_t armv4_5_mmu; + struct armv4_5_mmu_common armv4_5_mmu; uint32_t cp15_control_reg; int fast_memory_access; -- 2.30.2