X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fgdb-server.c;h=e98f78078bfb6e23ca89a85bc4e0cd0f6e40ed64;hb=13d7162b0e2d5c148d0548eeaa99a6b18baef37c;hp=615bf06c04e5d872911c88be734047df9f63b339;hpb=47bb36079b0dbfafc4fc54d3734f95de92587080;p=fw%2Fstlink

diff --git a/src/gdb-server.c b/src/gdb-server.c
index 615bf06..e98f780 100644
--- a/src/gdb-server.c
+++ b/src/gdb-server.c
@@ -271,15 +271,27 @@ int serve(struct stlink* sl, int port) {
 		case 'c':
 			stlink_run(sl);
 
-			printf("Core running, waiting for interrupt.\n");
+			printf("Core running, waiting for interrupt (either in chip or GDB).\n");
 
-			int status = gdb_wait_for_interrupt(client);
-			if(status < 0) {
-				fprintf(stderr, "cannot wait for int: %d\n", status);
-				return 1;
-			}
+			while(1) {
+				int status = gdb_check_for_interrupt(client);
+				if(status < 0) {
+					fprintf(stderr, "cannot check for int: %d\n", status);
+					return 1;
+				}
+
+				if(status == 1) {
+					stlink_force_debug(sl);
+					break;
+				}
+
+				stlink_status(sl);
+				if(sl->core_stat == STLINK_CORE_HALTED) {
+					break;
+				}
 
-			stlink_force_debug(sl);
+				usleep(200000);
+			}
 
 			reply = strdup("S05"); // TRAP
 			break;