[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1285-gbd6072072

[OpenOCD-Gerrit <ope...@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  bd6072072eabf3b0ad61ee63c78ccf53f49ab957 (commit)
       via  9a690c6bdb18d722a99d5752ac9c3ae1733cf22e (commit)
      from  7e78c04f1c275176bdee8f9d2553300218164577 (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 bd6072072eabf3b0ad61ee63c78ccf53f49ab957
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Mon Apr 27 13:09:27 2020 +0100

    stlink: code factorization by introducing stlink_usb_exit_mode
    
    Change-Id: I4abd6432c4ef969e382bfed96cd19a49d9610000
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5612
    Tested-by: jenkins

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 3fdb126cf..72975d5ac 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -1303,12 +1303,11 @@ static enum stlink_mode stlink_get_mode(enum hl_transports t)
 }
 
 /** */
-static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int initial_interface_speed)
+static int stlink_usb_exit_mode(void *handle)
 {
 	int res;
 	uint8_t mode;
 	enum stlink_mode emode;
-	struct stlink_usb_handle_s *h = handle;
 
 	assert(handle != NULL);
 
@@ -1337,12 +1336,25 @@ static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int init
 			break;
 	}
 
-	if (emode != STLINK_MODE_UNKNOWN) {
-		res = stlink_usb_mode_leave(handle, emode);
+	if (emode != STLINK_MODE_UNKNOWN)
+		return stlink_usb_mode_leave(handle, emode);
 
-		if (res != ERROR_OK)
-			return res;
-	}
+	return ERROR_OK;
+}
+
+/** */
+static int stlink_usb_init_mode(void *handle, bool connect_under_reset, int initial_interface_speed)
+{
+	int res;
+	uint8_t mode;
+	enum stlink_mode emode;
+	struct stlink_usb_handle_s *h = handle;
+
+	assert(handle != NULL);
+
+	res = stlink_usb_exit_mode(handle);
+	if (res != ERROR_OK)
+		return res;
 
 	res = stlink_usb_current_mode(handle, &mode);
 
@@ -2683,45 +2695,14 @@ static int stlink_speed(void *handle, int khz, bool query)
 /** */
 static int stlink_usb_close(void *handle)
 {
-	int res;
-	uint8_t mode;
-	enum stlink_mode emode;
 	struct stlink_usb_handle_s *h = handle;
 
-	if (h && h->fd)
-		res = stlink_usb_current_mode(handle, &mode);
-	else
-		res = ERROR_FAIL;
-	/* do not exit if return code != ERROR_OK,
-	   it prevents us from closing jtag_libusb */
-
-	if (res == ERROR_OK) {
-		/* try to exit current mode */
-		switch (mode) {
-			case STLINK_DEV_DFU_MODE:
-				emode = STLINK_MODE_DFU;
-				break;
-			case STLINK_DEV_DEBUG_MODE:
-				emode = STLINK_MODE_DEBUG_SWD;
-				break;
-			case STLINK_DEV_SWIM_MODE:
-				emode = STLINK_MODE_DEBUG_SWIM;
-				break;
-			case STLINK_DEV_BOOTLOADER_MODE:
-			case STLINK_DEV_MASS_MODE:
-			default:
-				emode = STLINK_MODE_UNKNOWN;
-				break;
-		}
-
-		if (emode != STLINK_MODE_UNKNOWN)
-			stlink_usb_mode_leave(handle, emode);
-			/* do not check return code, it prevent
-			us from closing jtag_libusb */
-	}
-
-	if (h && h->fd)
+	if (h && h->fd) {
+		stlink_usb_exit_mode(h);
+		/* do not check return code, it prevent
+		us from closing jtag_libusb */
 		jtag_libusb_close(h->fd);
+	}
 
 	free(h);
 

commit 9a690c6bdb18d722a99d5752ac9c3ae1733cf22e
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Thu Apr 23 11:00:31 2020 +0100

    openocd: fix issue in WIN32 with TCP adapters
    
    Issue: server_quit is called before adapter_quit:
      In WIN32 only in server_quit we do an WSACleanup,
      which terminates/closes all active sockets.
      So if the adapter is TCP based, the adapter.quit handler
      will fail if it will need to send some commands through TCP.
    
    Example: close_socket in jtag_vpi_quit will fail in WIN32
      because the socket is already closed
      and the errno is set as "Bad File Descriptor"
    
    To fix that we introduced new functions called server_host_os_entry/quit
    to manage specific OS setup (hence WSA for sockets in WINDOWS) in order
    to delay WSACleanup after adapter_quit().
    
    Change-Id: Ie4afacafe123857f6ae300e376bdfcf0d8c027ac
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5456
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/openocd.c b/src/openocd.c
index 2a9a0b3d4..886228425 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -345,6 +345,8 @@ int openocd_main(int argc, char *argv[])
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
+	server_host_os_entry();
+
 	/* Start the executable meat that can evolve into thread in future. */
 	ret = openocd_thread(argc, argv, cmd_ctx);
 
@@ -360,6 +362,8 @@ int openocd_main(int argc, char *argv[])
 
 	adapter_quit();
 
+	server_host_os_close();
+
 	/* Shutdown commandline interface */
 	command_exit(cmd_ctx);
 
diff --git a/src/server/server.c b/src/server/server.c
index 07b7ae487..23a15ef9a 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -631,7 +631,7 @@ static void sigkey_handler(int sig)
 #endif
 
 
-int server_preinit(void)
+int server_host_os_entry(void)
 {
 	/* this currently only calls WSAStartup on native win32 systems
 	 * before any socket operations are performed.
@@ -647,7 +647,21 @@ int server_preinit(void)
 		LOG_ERROR("Failed to Open Winsock");
 		return ERROR_FAIL;
 	}
+#endif
+	return ERROR_OK;
+}
 
+int server_host_os_close(void)
+{
+#ifdef _WIN32
+	WSACleanup();
+#endif
+	return ERROR_OK;
+}
+
+int server_preinit(void)
+{
+#ifdef _WIN32
 	/* register ctrl-c handler */
 	SetConsoleCtrlHandler(ControlHandler, TRUE);
 
@@ -688,7 +702,6 @@ int server_quit(void)
 	target_quit();
 
 #ifdef _WIN32
-	WSACleanup();
 	SetConsoleCtrlHandler(ControlHandler, FALSE);
 
 	return ERROR_OK;
diff --git a/src/server/server.h b/src/server/server.h
index ab9b72f90..f4cc39d3a 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -80,6 +80,9 @@ int add_service(char *name, const char *port,
 		void *priv);
 int remove_service(const char *name, const char *port);
 
+int server_host_os_entry(void);
+int server_host_os_close(void);
+
 int server_preinit(void);
 int server_init(struct command_context *cmd_ctx);
 int server_quit(void);

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

Summary of changes:
 src/jtag/drivers/stlink_usb.c | 67 ++++++++++++++++---------------------------
 src/openocd.c                 |  4 +++
 src/server/server.c           | 17 +++++++++--
 src/server/server.h           |  3 ++
 4 files changed, 46 insertions(+), 45 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository