[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-191-gff404da

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  ff404da1558f0dcc5d92b18caa1706b9edf067d1 (commit)
      from  32188c500468c117d2a79106ba9ae41d61ce1897 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ff404da1558f0dcc5d92b18caa1706b9edf067d1
Author: Marc Pignat <mar...@he...>
Date:   Fri Feb 12 08:23:44 2010 +0100

    arm920: add virt2phys fn
    
    Copy of the 926ejs function. I have tested it only using
    my rtems application (where virtual address mapping == physical).
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index e0b1c70..e04d9fc 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -472,9 +472,19 @@ static int arm920_mmu(struct target *target, int *enabled)
 static int arm920_virt2phys(struct target *target,
 		uint32_t virt, uint32_t *phys)
 {
-	/** @todo Implement this!  */
-	LOG_ERROR("%s: not implemented", __func__);
-	return ERROR_FAIL;
+	int type;
+	uint32_t cb;
+	int domain;
+	uint32_t ap;
+	struct arm920t_common *arm920t = target_to_arm920(target);
+
+	uint32_t ret = armv4_5_mmu_translate_va(target, &arm920t->armv4_5_mmu, virt, &type, &cb, &domain, &ap);
+	if (type == -1)
+	{
+		return ret;
+	}
+	*phys = ret;
+	return ERROR_OK;
 }
 
 /** Reads a buffer, in the specified word size, with current MMU settings. */

-----------------------------------------------------------------------

Summary of changes:
 src/target/arm920t.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository