armv4_5_mmu_common_t -> struct armv4_5_mmu_common

Remove misleading typedef and redundant suffix from struct armv4_5_mmu_common.
This commit is contained in:
Zachary T Welch 2009-11-13 08:41:27 -08:00
parent 405a5df786
commit f6dae0cf84
7 changed files with 14 additions and 14 deletions

View File

@ -29,7 +29,7 @@ struct arm720t_common
{ {
struct arm7tdmi_common arm7tdmi_common; struct arm7tdmi_common arm7tdmi_common;
uint32_t common_magic; 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 cp15_control_reg;
uint32_t fsr_reg; uint32_t fsr_reg;
uint32_t far_reg; uint32_t far_reg;

View File

@ -29,7 +29,7 @@ struct arm920t_common
{ {
struct arm9tdmi_common arm9tdmi_common; struct arm9tdmi_common arm9tdmi_common;
uint32_t common_magic; 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 cp15_control_reg;
uint32_t d_fsr; uint32_t d_fsr;
uint32_t i_fsr; uint32_t i_fsr;

View File

@ -29,7 +29,7 @@ struct arm926ejs_common
{ {
struct arm9tdmi_common arm9tdmi_common; struct arm9tdmi_common arm9tdmi_common;
uint32_t common_magic; 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 (*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); 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; uint32_t cp15_control_reg;

View File

@ -25,14 +25,14 @@
#include "armv4_5_mmu.h" #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[] = char* armv4_5_mmu_page_type_names[] =
{ {
"section", "large page", "small page", "tiny page" "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 first_lvl_descriptor = 0x0;
uint32_t second_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; 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; 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; 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; int retval;

View File

@ -23,7 +23,7 @@
#include "armv4_5_cache.h" #include "armv4_5_cache.h"
#include "target.h" #include "target.h"
typedef struct armv4_5_mmu_common_s struct armv4_5_mmu_common
{ {
uint32_t (*get_ttb)(target_t *target); 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); 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; struct armv4_5_cache_common armv4_5_cache;
int has_tiny_pages; int has_tiny_pages;
int mmu_enabled; int mmu_enabled;
} armv4_5_mmu_common_t; };
enum enum
{ {
@ -43,15 +43,15 @@ enum
extern char* armv4_5_page_type_names[]; extern char* armv4_5_page_type_names[];
uint32_t armv4_5_mmu_translate_va(target_t *target, 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); uint32_t *cb, int *domain, uint32_t *ap);
int armv4_5_mmu_read_physical(target_t *target, 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); uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
int armv4_5_mmu_write_physical(target_t *target, 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); uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
enum enum

View File

@ -105,7 +105,7 @@ typedef struct armv7a_common_s
uint8_t memory_ap; uint8_t memory_ap;
/* Cache and Memory Management Unit */ /* 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; armv4_5_common_t armv4_5_common;
// int (*full_context)(struct target_s *target); // int (*full_context)(struct target_s *target);

View File

@ -125,7 +125,7 @@ typedef struct xscale_common_s
int arch_debug_reason; int arch_debug_reason;
/* MMU/Caches */ /* MMU/Caches */
armv4_5_mmu_common_t armv4_5_mmu; struct armv4_5_mmu_common armv4_5_mmu;
uint32_t cp15_control_reg; uint32_t cp15_control_reg;
int fast_memory_access; int fast_memory_access;