[openocd-svn] Main OpenOCD repository branch, master, updated. 0.2.0-351-g4f4f4ab

[Ø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  4f4f4ab35a2ee485ee19e3c7b6e7d35faac6daa8 (commit)
       via  94add4688d2fbe7003b1e118bbcd68cc0ee82a30 (commit)
       via  7a83ea411468d00b68e358b87a0845d1ad3c35a9 (commit)
      from  3fef24258ab803e92fefd8191944299da54ba286 (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 4f4f4ab35a2ee485ee19e3c7b6e7d35faac6daa8
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Oct 12 14:10:49 2009 +0200

    Propagate wDTR/rDTR failure immediately, otherwise it's followed up by timeout errors.

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 588ea3c..915bee6 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -610,6 +610,7 @@ int arm11_leave_debug_state(arm11_common_t * arm11)
 		if (DSCR & (ARM11_DSCR_RDTR_FULL | ARM11_DSCR_WDTR_FULL))
 		{
 			LOG_ERROR("wDTR/rDTR inconsistent (DSCR %08" PRIx32 ")", DSCR);
+			return ERROR_FAIL;
 		}
 	}
 

commit 94add4688d2fbe7003b1e118bbcd68cc0ee82a30
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Oct 12 14:09:10 2009 +0200

    Fix warning and improve error message upon burst transfer failure

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 9aa7a30..1ab6c52 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -585,8 +585,8 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, uint32_t opcode,
 	arm11_setup_field(arm11,  1,    NULL,			NULL,				chain5_fields + 2);
 
 	uint8_t			*Readies;
-	int readiesNum = (count + 1);
-	int bytes = sizeof(*Readies)*readiesNum;
+	size_t readiesNum = (count + 1);
+	size_t bytes = sizeof(*Readies)*readiesNum;
 	Readies = (uint8_t *) malloc(bytes);
 	if (Readies == NULL)
 	{
@@ -634,7 +634,7 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, uint32_t opcode,
 		}
 
 		if (error_count > 0 )
-			LOG_ERROR(ZU " words not transferred", error_count);
+			LOG_ERROR(ZU " words out of " ZU " not transferred", error_count, readiesNum);
 
 	}
 

commit 7a83ea411468d00b68e358b87a0845d1ad3c35a9
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Oct 12 14:08:29 2009 +0200

    burst writes work fine. clean up junk.

diff --git a/tcl/board/imx35pdk.cfg b/tcl/board/imx35pdk.cfg
index 05d83ee..7724bac 100644
--- a/tcl/board/imx35pdk.cfg
+++ b/tcl/board/imx35pdk.cfg
@@ -2,9 +2,6 @@
 source [find target/imx35.cfg]
 $_TARGETNAME configure -event reset-init { imx35pdk_init }
 
-memwrite burst disable
-#arm11 no_increment enable
-
 
 global TARGETNAME 
 set TARGETNAME $_TARGETNAME

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

Summary of changes:
 src/target/arm11.c        |    1 +
 src/target/arm11_dbgtap.c |    6 +++---
 tcl/board/imx35pdk.cfg    |    3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository