[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-rc0-16-g1b60ce8

[Ø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  1b60ce8d5badb730739744323cb7cd4ac6c252af (commit)
      from  f37c9b8d1560d0081e53c71c55113a3c9858011a (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 1b60ce8d5badb730739744323cb7cd4ac6c252af
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue Nov 3 15:38:09 2009 +0100

    target: 20 second timeout/megabyte for CRC check
    
    There was a fixed 20 second timeout which is too little
    for large, slow timeout checks.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 2b064f2..3275584 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2821,8 +2821,11 @@ int arm7_9_checksum_memory(struct target_s *target, uint32_t address, uint32_t c
 	buf_set_u32(reg_params[0].value, 0, 32, address);
 	buf_set_u32(reg_params[1].value, 0, 32, count);
 
+	/* 20 second timeout/megabyte */
+	int timeout = 20000 * (1 + (count / (1024*1024)));
+
 	if ((retval = target_run_algorithm(target, 0, NULL, 2, reg_params,
-		crc_algorithm->address, crc_algorithm->address + (sizeof(arm7_9_crc_code) - 8), 20000, &armv4_5_info)) != ERROR_OK)
+		crc_algorithm->address, crc_algorithm->address + (sizeof(arm7_9_crc_code) - 8), timeout, &armv4_5_info)) != ERROR_OK)
 	{
 		LOG_ERROR("error executing arm7_9 crc algorithm");
 		destroy_reg_param(&reg_params[0]);

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

Summary of changes:
 src/target/arm7_9_common.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository