auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: add server_preinit which is called before config file is parsed.

Browse Source 
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 <ntfreak@users.sourceforge.net>
This commit is contained in:
Spencer Oliver
2009-12-10 14:31:28 +00:00
parent 6b9c14e908
commit 08589462ad
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openocd.c
View File

@@ -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;