X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=2f4bfb0043dc393da9247644d5d80b9bdbc3b563;hb=c6dd6a576d0b680f67ad9fd8af12fb342b26c83d;hp=256c590da082b1174cefc26a0813fbbfe3c18392;hpb=64653b0bbb0b2ac87de83d867f241360087b7588;p=fw%2Fopenocd

diff --git a/src/server/server.c b/src/server/server.c
index 256c590da..2f4bfb004 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "server.h"
-#include "target.h"
+#include <target/target.h>
 #include "openocd.h"
 #include "tcl_server.h"
 #include "telnet_server.h"
@@ -386,7 +386,7 @@ int server_loop(struct command_context *command_context)
 		}
 
 		target_call_timer_callbacks();
-		process_jim_events ();
+		process_jim_events(command_context);
 
 		if (retval == 0)
 		{
@@ -487,7 +487,7 @@ void sig_handler(int sig) {
 }
 #endif
 
-int server_init(void)
+int server_init(struct command_context *cmd_ctx)
 {
 #ifdef _WIN32
 	WORD wVersionRequested;
@@ -518,7 +518,7 @@ int server_init(void)
 	signal(SIGABRT, sig_handler);
 #endif
 
-	int ret = tcl_init();
+	int ret = tcl_init(cmd_ctx);
 	if (ERROR_OK != ret)
 		return ret;