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

[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  1dad2ee602674de1b97548913dba2d53267d35a3 (commit)
      from  9ff16575d2838527afa635058c4cb95d641533ba (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 1dad2ee602674de1b97548913dba2d53267d35a3
Author: Edgar Grimberg <edg...@zy...>
Date:   Mon Jan 25 16:34:27 2010 +0100

    core arm11: Silence logs at level 3 if there is no activity
    
    If the target and openocd are idling, the log should normally
    be silent at level 3.  (Given no verbose logging options.)
    
    Signed-off-by: Edgar Grimberg <edg...@zy...>
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index e311bfb..8a580e9 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -530,10 +530,12 @@ int jtag_add_statemove(tap_state_t goal_state)
 {
 	tap_state_t cur_state = cmd_queue_cur_state;
 
-	LOG_DEBUG("cur_state=%s goal_state=%s",
-		tap_state_name(cur_state),
-		tap_state_name(goal_state));
-
+	if (goal_state != cur_state)
+	{
+		LOG_DEBUG("cur_state=%s goal_state=%s",
+			tap_state_name(cur_state),
+			tap_state_name(goal_state));
+	}
 
 	/* If goal is RESET, be paranoid and force that that transition
 	 * (e.g. five TCK cycles, TMS high).  Else trust "cur_state".
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 8b7b69c..671943f 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -64,10 +64,10 @@ static int arm11_step(struct target *target, int current,
 static int arm11_check_init(struct arm11_common *arm11)
 {
 	CHECK_RETVAL(arm11_read_DSCR(arm11));
-	LOG_DEBUG("DSCR %08x", (unsigned) arm11->dscr);
 
 	if (!(arm11->dscr & DSCR_HALT_DBG_MODE))
 	{
+		LOG_DEBUG("DSCR %08x", (unsigned) arm11->dscr);
 		LOG_DEBUG("Bringing target into debug mode");
 
 		arm11->dscr |= DSCR_HALT_DBG_MODE;

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

Summary of changes:
 src/jtag/core.c    |   10 ++++++----
 src/target/arm11.c |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository