7 files changed, 8 insertions, 27 deletions
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index d4502241..8db0b5d5 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -255,13 +255,11 @@ static int arm720_virt2phys(struct target *target,
 		uint32_t virtual, uint32_t *physical)
 {
 	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, &cb, &domain, &ap, &ret);
+			&arm720t->armv4_5_mmu, virtual, &cb, &ret);
 	if (retval != ERROR_OK)
 		return retval;
 	*physical = ret;
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index b8ff8191..b99b4d5e 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -509,13 +509,11 @@ static int arm920_virt2phys(struct target *target,
 		uint32_t virt, uint32_t *phys)
 {
 	uint32_t cb;
-	int domain;
-	uint32_t ap;
 	struct arm920t_common *arm920t = target_to_arm920(target);
 
 	uint32_t ret;
 	int retval = armv4_5_mmu_translate_va(target,
-			&arm920t->armv4_5_mmu, virt, &cb, &domain, &ap, &ret);
+			&arm920t->armv4_5_mmu, virt, &cb, &ret);
 	if (retval != ERROR_OK)
 		return retval;
 	*phys = ret;
@@ -579,15 +577,13 @@ int arm920t_write_memory(struct target *target, uint32_t address,
 		 * by MMU
 		 */
 		uint32_t cb;
-		int domain;
-		uint32_t ap;
 		uint32_t pa;
 
 		/*
 		 * We need physical address and cb
 		 */
 		retval = armv4_5_mmu_translate_va(target, &arm920t->armv4_5_mmu,
-				address, &cb, &domain, &ap, &pa);
+				address, &cb, &pa);
 		if (retval != ERROR_OK)
 			return retval;
 
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index dd1d3656..918306d0 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -721,13 +721,11 @@ COMMAND_HANDLER(arm926ejs_handle_cache_info_command)
 static int arm926ejs_virt2phys(struct target *target, uint32_t virtual, uint32_t *physical)
 {
 	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, &cb, &domain, &ap, &ret);
+			virtual, &cb, &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 78163f18..861410dd 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, 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, uint32_t *val)
 {
 	uint32_t first_lvl_descriptor = 0x0;
 	uint32_t second_lvl_descriptor = 0x0;
@@ -54,14 +54,10 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
 		return ERROR_TARGET_TRANSLATION_FAULT;
 	}
 
-	/* domain is always specified in bits 8-5 */
-	*domain = (first_lvl_descriptor & 0x1e0) >> 5;
-
 	if ((first_lvl_descriptor & 0x3) == 2)
 	{
 		/* section descriptor */
 		*cb = (first_lvl_descriptor & 0xc) >> 2;
-		*ap = (first_lvl_descriptor & 0xc00) >> 10;
 		*val = (first_lvl_descriptor & 0xfff00000) | (va & 0x000fffff);
 		return ERROR_OK;
 	}
@@ -101,7 +97,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 */
-		*ap = (second_lvl_descriptor & 0xff0) >> 4;
 		*val = (second_lvl_descriptor & 0xffff0000) | (va & 0x0000ffff);
 		return ERROR_OK;
 	}
@@ -109,7 +104,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 */
-		*ap = (second_lvl_descriptor & 0xff0) >> 4;
 		*val = (second_lvl_descriptor & 0xfffff000) | (va & 0x00000fff);
 		return ERROR_OK;
 	}
@@ -117,7 +111,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 */
-		*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 8f540a67..24f39934 100644
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -38,7 +38,7 @@ struct armv4_5_mmu_common
 
 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 *cb, uint32_t *val);
 
 int armv4_5_mmu_read_physical(struct target *target,
 		struct armv4_5_mmu_common *armv4_5_mmu,
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index e26bb3d1..c2d61a3e 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -1802,8 +1802,6 @@ static int cortex_a8_virt2phys(struct target *target,
 		uint32_t virt, uint32_t *phys)
 {
 	uint32_t cb;
-	int domain;
-	uint32_t ap;
 	struct cortex_a8_common *cortex_a8 = target_to_cortex_a8(target);
 	// struct armv7a_common *armv7a = &cortex_a8->armv7a_common;
 	struct armv7a_common *armv7a = target_to_armv7a(target);
@@ -1818,7 +1816,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, &cb, &domain, &ap, &ret);
+			&armv7a->armv4_5_mmu, virt, &cb, &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 e2b4b6df..d5c21299 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3217,8 +3217,6 @@ static int xscale_virt2phys(struct target *target,
 {
 	struct xscale_common *xscale = target_to_xscale(target);
 	uint32_t cb;
-	int domain;
-	uint32_t ap;
 
 	if (xscale->common_magic != XSCALE_COMMON_MAGIC) {
 		LOG_ERROR(xscale_not);
@@ -3227,7 +3225,7 @@ static int xscale_virt2phys(struct target *target,
 
 	uint32_t ret;
 	int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu,
-			virtual, &cb, &domain, &ap, &ret);
+			virtual, &cb, &ret);
 	if (retval != ERROR_OK)
 		return retval;
 	*physical = ret;