From 8404dc36575c4a1c0d61b91258b769e1af1201b6 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 4 Mar 2008 21:12:01 +0000
Subject: [PATCH] Bogus error message in GDB removed

git-svn-id: svn://svn.berlios.de/openocd/trunk@443 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/flash/flash.c       | 11 +++++++++++
 src/flash/flash.h       |  1 +
 src/server/gdb_server.c |  5 ++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/flash/flash.c b/src/flash/flash.c
index db4449d5..92ac6fd6 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -181,6 +181,17 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num)
 	return NULL;
 }
 
+int flash_get_bank_count()
+{
+	flash_bank_t *p;
+	int i = 0;
+	for (p = flash_banks; p; p = p->next)
+	{
+		i++;
+	}
+	return i;
+}
+
 flash_bank_t *get_flash_bank_by_num(int num)
 {
 	flash_bank_t *p = get_flash_bank_by_num_noprobe(num);
diff --git a/src/flash/flash.h b/src/flash/flash.h
index 7ba516ab..2e6c1ec0 100644
--- a/src/flash/flash.h
+++ b/src/flash/flash.h
@@ -77,6 +77,7 @@ extern int flash_init_drivers(struct command_context_s *cmd_ctx);
 extern int flash_erase_address_range(target_t *target, u32 addr, u32 length);
 extern int flash_write(target_t *target, image_t *image, u32 *written, int erase);
 extern void flash_set_dirty(void);
+extern int flash_get_bank_count();
 
 extern flash_bank_t *get_flash_bank_by_num(int num);
 extern flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 74722e10..a8b60231 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1560,8 +1560,8 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
 
 		xml_printf(&retval, &xml, &pos, &size, "<memory-map>\n");
 
-		int i = 0;
-		for (;;)
+		int i;
+		for (i=0; i<flash_get_bank_count(); i++)
 		{
 			p = get_flash_bank_by_num(i);
 			if (p == NULL)
@@ -1575,7 +1575,6 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
 				"<property name=\"blocksize\">0x%x</property>\n" \
 				"</memory>\n", \
 				p->base, p->size, blocksize);
-			i++;
 		}
 
 		xml_printf(&retval, &xml, &pos, &size, "</memory-map>\n");
-- 
2.39.5