X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=76c3e363e9971396c3012df0ed533694ced21ad1;hp=a1ff7c8ed669e112d2f6d26f5db8d8c8448040a1;hb=9f26aff39c047d813047b4f4bae1f5de3cfc56b1;hpb=818120d4092be0d0a7cae50140dc339581cae7fc

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index a1ff7c8ed6..76c3e363e9 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -760,22 +760,22 @@ static void gdb_frontend_halted(struct target *target, struct connection *connec
 	if (gdb_connection->frontend_state == TARGET_RUNNING)
 	{
 		char sig_reply[4];
-		int signal;
+		int signal_var;
 
 		/* stop forwarding log packets! */
 		log_remove_callback(gdb_log_callback, connection);
 
 		if (gdb_connection->ctrl_c)
 		{
-			signal = 0x2;
+			signal_var = 0x2;
 			gdb_connection->ctrl_c = 0;
 		}
 		else
 		{
-			signal = gdb_last_signal(target);
+			signal_var = gdb_last_signal(target);
 		}
 
-		snprintf(sig_reply, 4, "T%2.2x", signal);
+		snprintf(sig_reply, 4, "T%2.2x", signal_var);
 		gdb_put_packet(connection, sig_reply, 3);
 		gdb_connection->frontend_state = TARGET_HALTED;
 	}
@@ -945,11 +945,11 @@ static int gdb_last_signal_packet(struct connection *connection,
 		struct target *target, char* packet, int packet_size)
 {
 	char sig_reply[4];
-	int signal;
+	int signal_var;
 
-	signal = gdb_last_signal(target);
+	signal_var = gdb_last_signal(target);
 
-	snprintf(sig_reply, 4, "S%2.2x", signal);
+	snprintf(sig_reply, 4, "S%2.2x", signal_var);
 	gdb_put_packet(connection, sig_reply, 3);
 
 	return ERROR_OK;
@@ -1681,6 +1681,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;
@@ -1707,10 +1708,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++) {