[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-922-g0858946

[Spencer O. <nt...@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  08589462adf3f81b480faacecb8352428212a2f5 (commit)
       via  6b9c14e9085b5620c20e9cadffe1f5e64f09a0c6 (commit)
      from  97996214f593d0d1969446484598c58077da3965 (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 08589462adf3f81b480faacecb8352428212a2f5
Author: Spencer Oliver <nt...@us...>
Date:   Thu Dec 10 14:31:28 2009 +0000

    server: add server_preinit which is called before config file is parsed.
    
    This fixes the issue under native win32 of the socket interface not being
    enabled (via WSAStartup) before init is called from a script.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/openocd.c b/src/openocd.c
index 8cb8674..1105d2a 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -62,7 +62,6 @@ COMMAND_HANDLER(handle_version_command)
 	return ERROR_OK;
 }
 
-
 static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
 	switch (event)
@@ -255,13 +254,15 @@ int openocd_main(int argc, char *argv[])
 		"http://openocd.berlios.de/doc/doxygen/bugs.html"
 		"\n");
 
-
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
 	if (parse_cmdline_args(cmd_ctx, argc, argv) != ERROR_OK)
 		return EXIT_FAILURE;
 
+	if (server_preinit() != ERROR_OK)
+		return EXIT_FAILURE;
+
 	ret = parse_config_file(cmd_ctx);
 	if (ret != ERROR_OK)
 		return EXIT_FAILURE;
diff --git a/src/server/server.c b/src/server/server.c
index 2f4bfb0..75a6bed 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -487,8 +487,12 @@ void sig_handler(int sig) {
 }
 #endif
 
-int server_init(struct command_context *cmd_ctx)
+int server_preinit(void)
 {
+	/* this currently only calls WSAStartup on native win32 systems
+	 * before any socket operations are performed.
+	 * This is an issue if you call init in your config script */
+
 #ifdef _WIN32
 	WORD wVersionRequested;
 	WSADATA wsaData;
@@ -518,6 +522,11 @@ int server_init(struct command_context *cmd_ctx)
 	signal(SIGABRT, sig_handler);
 #endif
 
+	return ERROR_OK;
+}
+
+int server_init(struct command_context *cmd_ctx)
+{
 	int ret = tcl_init(cmd_ctx);
 	if (ERROR_OK != ret)
 		return ret;
diff --git a/src/server/server.h b/src/server/server.h
index be1afbe..a25920e 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -74,6 +74,7 @@ int add_service(char *name, enum connection_type type, unsigned short port,
 		input_handler_t in_handler, connection_closed_handler_t close_handler,
 		void *priv);
 
+int server_preinit(void);
 int server_init(struct command_context *cmd_ctx);
 int server_quit(void);
 

commit 6b9c14e9085b5620c20e9cadffe1f5e64f09a0c6
Author: Spencer Oliver <nt...@us...>
Date:   Thu Dec 10 11:28:38 2009 +0000

    build: fix cygwin build warnings
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 54f7cb1..4ca4349 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -186,7 +186,7 @@ static void jlink_execute_reset(struct jtag_command *cmd)
 
 static void jlink_execute_sleep(struct jtag_command *cmd)
 {
-	DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
+	DEBUG_JTAG_IO("sleep %" PRIi32 "", cmd->cmd.sleep->us);
 	jlink_tap_execute();
 	jtag_sleep(cmd->cmd.sleep->us);
 }

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

Summary of changes:
 src/jtag/drivers/jlink.c |    2 +-
 src/openocd.c            |    5 +++--
 src/server/server.c      |   11 ++++++++++-
 src/server/server.h      |    1 +
 4 files changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository