arm926ejs: -Wshadow warning fix

[fw/openocd] / src / target / armv4_5_mmu.h

diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h
index 428a3731328cd654dc7a932fb221e33f8c8c224b..24f3993424e71226739152d4270cba03957d183e 100644 (file)
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -20,7 +20,7 @@
 #ifndef ARMV4_5_MMU_H
 #define ARMV4_5_MMU_H
 
-#include <target/armv4_5_cache.h>
+#include "armv4_5_cache.h"
 
 struct target;
 
@@ -36,16 +36,9 @@ 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[];
-
-uint32_t 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);
+int armv4_5_mmu_translate_va(struct target *target,
+               struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va,
+               uint32_t *cb, uint32_t *val);
 
 int armv4_5_mmu_read_physical(struct target *target,
                struct armv4_5_mmu_common *armv4_5_mmu,