From: Fabien Le Mentec <texane@gmail.com>
Date: Fri, 14 Oct 2011 21:08:44 +0000 (-0500)
Subject: [fix] GDB port fixed to 4242 until better command line parsing. leave DFU mode.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=f01fc0c4f15b266fdebdda930836db86054e5a57;hp=ea11de2d8b1e12f689ae50ed36829c6be6f5929c;p=fw%2Fstlink

[fix] GDB port fixed to 4242 until better command line parsing. leave DFU mode.
---

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index c06ea97..72f433f 100644
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -138,8 +138,13 @@ int main(int argc, char** argv) {
 		}
 	}
 
-	if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
-		stlink_enter_swd_mode(sl);
+        if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) {
+            stlink_exit_dfu_mode(sl);
+        }
+
+	if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE) {
+	  stlink_enter_swd_mode(sl);
+	}
 
 	uint32_t chip_id = stlink_chip_id(sl);
 	printf("Chip ID is %08x.\n", chip_id);
@@ -173,14 +178,7 @@ int main(int argc, char** argv) {
 	// memory map is in 1k blocks.
 	current_memory_map = make_memory_map(params, flash_size * 0x400);
 
-	int port;
-
-	if(argc == 1) {
-		port = rand() & 0xffff;
-	}
-	else {
-		port = atoi(argv[1]);
-	}
+	int port = 4242;
 
 	while(serve(sl, port) == 0);