[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-399-g3099858

[Spencer O. <nt...@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  3099858c68fd3a5f9960daea429198c0fc5a0f10 (commit)
      from  1e0f89841575de2b8b6313825ec8edd8bc7910a0 (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 3099858c68fd3a5f9960daea429198c0fc5a0f10
Author: sb-sf <sb...@us...>
Date:   Mon Jul 5 14:06:34 2010 +0100

    gdbserver: incorrect memory map for multiple targets (bug #24)
    
    The gdb server incorrectly reports the memory map if we have
    multiple targets with multiple flash banks.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index e97839d..1d1d836 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1682,6 +1682,7 @@ static int gdb_memory_map(struct connection *connection,
 	char *separator;
 	uint32_t ram_start = 0;
 	int i;
+	int target_flash_banks = 0;
 
 	/* skip command character */
 	packet += 23;
@@ -1708,10 +1709,11 @@ static int gdb_memory_map(struct connection *connection,
 			gdb_error(connection, retval);
 			return retval;
 		}
-		banks[i] = p;
+		if(p->target == target)
+			banks[target_flash_banks++] = p;
 	}
 
-	qsort(banks, flash_get_bank_count(), sizeof(struct flash_bank *),
+	qsort(banks, target_flash_banks, sizeof(struct flash_bank *),
 			compare_bank);
 
 	for (i = 0; i < flash_get_bank_count(); i++) {

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

Summary of changes:
 src/server/gdb_server.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository