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

[David B. <dbr...@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  718ee762e7d6a81037670612a2f3d21da4784f56 (commit)
      from  82c3c47825b25012fef60df0a8a89110337cd40d (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 718ee762e7d6a81037670612a2f3d21da4784f56
Author: David Brownell <dbr...@us...>
Date:   Fri Jan 22 22:54:39 2010 -0800

    EmbeddedICE - fix Feroceon/Dragonite message
    
    The breakpoint/watchpoint message was wrong for Feroceon and
    Dragonite, which have only one working watchpoint unit.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index a705d7d..bf22036 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -192,6 +192,11 @@ embeddedice_build_reg_cache(struct target *target, struct arm7_9_common *arm7_9)
 	reg_cache->reg_list = reg_list;
 	reg_cache->num_regs = num_regs;
 
+	/* FIXME the second watchpoint unit on Feroceon and Dragonite
+	 * seems not to work ... we should have a way to not set up
+	 * its four registers here!
+	 */
+
 	/* set up registers */
 	for (i = 0; i < num_regs; i++)
 	{
@@ -290,8 +295,10 @@ embeddedice_build_reg_cache(struct target *target, struct arm7_9_common *arm7_9)
 				buf_get_u32(reg_list[EICE_COMMS_CTRL].value, 0, 32));
 	}
 
-	LOG_INFO("%s: hardware has 2 breakpoints or watchpoints",
-			target_name(target));
+	/* On Feroceon and Dragonite the second unit is seemingly missing. */
+	LOG_INFO("%s: hardware has %d breakpoint/watchpoint unit%s",
+			target_name(target), arm7_9->wp_available_max,
+			(arm7_9->wp_available_max != 1) ? "s" : "");
 
 	return reg_cache;
 }

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

Summary of changes:
 src/target/embeddedice.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository