Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: ce58ab9)
TARGET: removed unsed parameter
authorAntonio Borneo <borneo.antonio@gmail.com>
Sat, 12 Jun 2010 03:58:50 +0000 (11:58 +0800)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Sat, 12 Jun 2010 10:08:12 +0000 (12:08 +0200)
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 <borneo.antonio@gmail.com>
src/target/arm720t.c patch | blob | history
src/target/arm920t.c patch | blob | history
src/target/arm926ejs.c patch | blob | history
src/target/armv4_5_mmu.c patch | blob | history
src/target/armv4_5_mmu.h patch | blob | history
src/target/cortex_a8.c patch | blob | history
src/target/xscale.c patch | blob | history

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index e7672b45a0a7dd67fc768c0961d309ed2f939368..d4502241d2b48dd2bf1ceb64de9393685e1ac8c3 100644 (file)
--- 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 fe2ff015e742df4b37b5c1cc7242d833e810d35c..b8ff8191e66dbe995f788417e8cdb68fd629d0a1 100644 (file)
--- 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 bfa2ab4ad401f6bdefc96d47b0af5abd1754d1b0..dd1d36561defcc2909c148954985ed0f3dfae40b 100644 (file)
--- 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 52756c11e6319885e698cf66cf91ae7100b032d5..78163f18f86eb0a4824806acb2d8ccdbbe076516 100644 (file)
--- 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 3a6851fa0478fd63b5a7c0c5215b67f87f2d19d7..8f540a67b543ab1f7e2c8ce0bc09dff65898d338 100644 (file)
--- 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 f15417924332dbc121e22ca37fb42da41cdebe2e..e26bb3d14d7ce39e23f616aea01cff6aa191b9bc 100644 (file)
--- 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 d16f8ec1facfff9b96645115e0818fabbbb2ec44..e2b4b6df5ffb7abd2aa41f97cd1deda5b1606562 100644 (file)
--- 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;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)