From 9e62f86f24dbd1a3f8d1a84fbfd18dc15dc23002 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Sat, 12 Jun 2010 11:58:50 +0800 Subject: [PATCH] TARGET: removed unsed parameter Parameter "type" of function armv4_5_mmu_translate_va() is now not used. Remove the parameter and the "enum" listing its values. Signed-off-by: Antonio Borneo --- src/target/arm720t.c | 4 ++-- src/target/arm920t.c | 6 ++---- src/target/arm926ejs.c | 4 ++-- src/target/armv4_5_mmu.c | 6 +----- src/target/armv4_5_mmu.h | 9 +-------- src/target/cortex_a8.c | 3 +-- src/target/xscale.c | 4 ++-- 7 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/target/arm720t.c b/src/target/arm720t.c index e7672b45a..d4502241d 100644 --- a/src/target/arm720t.c +++ b/src/target/arm720t.c @@ -254,14 +254,14 @@ static int arm720_mmu(struct target *target, int *enabled) static int arm720_virt2phys(struct target *target, uint32_t virtual, uint32_t *physical) { - int type; uint32_t cb; int domain; uint32_t ap; struct arm720t_common *arm720t = target_to_arm720(target); uint32_t ret; - int retval = armv4_5_mmu_translate_va(target, &arm720t->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret); + int retval = armv4_5_mmu_translate_va(target, + &arm720t->armv4_5_mmu, virtual, &cb, &domain, &ap, &ret); if (retval != ERROR_OK) return retval; *physical = ret; diff --git a/src/target/arm920t.c b/src/target/arm920t.c index fe2ff015e..b8ff8191e 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -508,7 +508,6 @@ static int arm920_mmu(struct target *target, int *enabled) static int arm920_virt2phys(struct target *target, uint32_t virt, uint32_t *phys) { - int type; uint32_t cb; int domain; uint32_t ap; @@ -516,7 +515,7 @@ static int arm920_virt2phys(struct target *target, uint32_t ret; int retval = armv4_5_mmu_translate_va(target, - &arm920t->armv4_5_mmu, virt, &type, &cb, &domain, &ap, &ret); + &arm920t->armv4_5_mmu, virt, &cb, &domain, &ap, &ret); if (retval != ERROR_OK) return retval; *phys = ret; @@ -579,7 +578,6 @@ int arm920t_write_memory(struct target *target, uint32_t address, * in memory marked read only * by MMU */ - int type; uint32_t cb; int domain; uint32_t ap; @@ -589,7 +587,7 @@ int arm920t_write_memory(struct target *target, uint32_t address, * We need physical address and cb */ retval = armv4_5_mmu_translate_va(target, &arm920t->armv4_5_mmu, - address, &type, &cb, &domain, &ap, &pa); + address, &cb, &domain, &ap, &pa); if (retval != ERROR_OK) return retval; diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index bfa2ab4ad..dd1d36561 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -720,14 +720,14 @@ COMMAND_HANDLER(arm926ejs_handle_cache_info_command) static int arm926ejs_virt2phys(struct target *target, uint32_t virtual, uint32_t *physical) { - int type; uint32_t cb; int domain; uint32_t ap; struct arm926ejs_common *arm926ejs = target_to_arm926(target); uint32_t ret; - int retval = armv4_5_mmu_translate_va(target, &arm926ejs->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret); + int retval = armv4_5_mmu_translate_va(target, &arm926ejs->armv4_5_mmu, + virtual, &cb, &domain, &ap, &ret); if (retval != ERROR_OK) return retval; *physical = ret; diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c index 52756c11e..78163f18f 100644 --- a/src/target/armv4_5_mmu.c +++ b/src/target/armv4_5_mmu.c @@ -26,7 +26,7 @@ #include "armv4_5_mmu.h" -int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val) +int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val) { uint32_t first_lvl_descriptor = 0x0; uint32_t second_lvl_descriptor = 0x0; @@ -60,7 +60,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a if ((first_lvl_descriptor & 0x3) == 2) { /* section descriptor */ - *type = ARMV4_5_SECTION; *cb = (first_lvl_descriptor & 0xc) >> 2; *ap = (first_lvl_descriptor & 0xc00) >> 10; *val = (first_lvl_descriptor & 0xfff00000) | (va & 0x000fffff); @@ -102,7 +101,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a if ((second_lvl_descriptor & 0x3) == 1) { /* large page descriptor */ - *type = ARMV4_5_LARGE_PAGE; *ap = (second_lvl_descriptor & 0xff0) >> 4; *val = (second_lvl_descriptor & 0xffff0000) | (va & 0x0000ffff); return ERROR_OK; @@ -111,7 +109,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a if ((second_lvl_descriptor & 0x3) == 2) { /* small page descriptor */ - *type = ARMV4_5_SMALL_PAGE; *ap = (second_lvl_descriptor & 0xff0) >> 4; *val = (second_lvl_descriptor & 0xfffff000) | (va & 0x00000fff); return ERROR_OK; @@ -120,7 +117,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a if ((second_lvl_descriptor & 0x3) == 3) { /* tiny page descriptor */ - *type = ARMV4_5_TINY_PAGE; *ap = (second_lvl_descriptor & 0x30) >> 4; *val = (second_lvl_descriptor & 0xfffffc00) | (va & 0x000003ff); return ERROR_OK; diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h index 3a6851fa0..8f540a67b 100644 --- a/src/target/armv4_5_mmu.h +++ b/src/target/armv4_5_mmu.h @@ -36,15 +36,8 @@ struct armv4_5_mmu_common int mmu_enabled; }; -enum -{ - ARMV4_5_SECTION, ARMV4_5_LARGE_PAGE, ARMV4_5_SMALL_PAGE, ARMV4_5_TINY_PAGE -}; - -extern char* armv4_5_page_type_names[]; - int armv4_5_mmu_translate_va(struct target *target, - struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, + struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val); int armv4_5_mmu_read_physical(struct target *target, diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c index f15417924..e26bb3d14 100644 --- a/src/target/cortex_a8.c +++ b/src/target/cortex_a8.c @@ -1801,7 +1801,6 @@ static int cortex_a8_mmu(struct target *target, int *enabled) static int cortex_a8_virt2phys(struct target *target, uint32_t virt, uint32_t *phys) { - int type; uint32_t cb; int domain; uint32_t ap; @@ -1819,7 +1818,7 @@ static int cortex_a8_virt2phys(struct target *target, cortex_a8->current_address_mode = ARM_MODE_SVC; uint32_t ret; int retval = armv4_5_mmu_translate_va(target, - &armv7a->armv4_5_mmu, virt, &type, &cb, &domain, &ap, &ret); + &armv7a->armv4_5_mmu, virt, &cb, &domain, &ap, &ret); if (retval != ERROR_OK) return retval; /* Reset the flag. We don't want someone else to use it by error */ diff --git a/src/target/xscale.c b/src/target/xscale.c index d16f8ec1f..e2b4b6df5 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -3216,7 +3216,6 @@ static int xscale_virt2phys(struct target *target, uint32_t virtual, uint32_t *physical) { struct xscale_common *xscale = target_to_xscale(target); - int type; uint32_t cb; int domain; uint32_t ap; @@ -3227,7 +3226,8 @@ static int xscale_virt2phys(struct target *target, } uint32_t ret; - int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret); + int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, + virtual, &cb, &domain, &ap, &ret); if (retval != ERROR_OK) return retval; *physical = ret;