duan ellis target tcl work in progress

[fw/openocd] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index 2d910a1ab0ee9bc5d794253046dca642f6ad29cb..26610cfd90265c895f58dff50aca7cf97f98588d 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -219,7 +222,7 @@ int remove_service(unsigned short port)
        return ERROR_OK;
 }
 
-int remove_services()
+int remove_services(void)
 {
        service_t *c = services;
 
@@ -246,8 +249,8 @@ int remove_services()
        return ERROR_OK;
 }
 
-extern void openocd_sleep_prelude();
-extern void openocd_sleep_postlude();
+extern void openocd_sleep_prelude(void);
+extern void openocd_sleep_postlude(void);
 
 int server_loop(command_context_t *command_context)
 {
@@ -303,13 +306,14 @@ int server_loop(command_context_t *command_context)
                }
                
 #ifndef _WIN32
-#ifndef BUILD_ECOSBOARD
+#if BUILD_ECOSBOARD == 0
                /* add STDIN to read_fds */
                FD_SET(fileno(stdin), &read_fds);
 #endif
 #endif
 
                openocd_sleep_prelude();
+               kept_alive();
                // Only while we're sleeping we'll let others run
                retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
                openocd_sleep_postlude();
@@ -342,6 +346,7 @@ int server_loop(command_context_t *command_context)
                }
                
                target_call_timer_callbacks();
+               process_jim_events ();
 
                if (retval == 0)
                {
@@ -396,7 +401,7 @@ int server_loop(command_context_t *command_context)
                }
                
 #ifndef _WIN32
-#ifndef BUILD_ECOSBOARD
+#if BUILD_ECOSBOARD == 0
                if (FD_ISSET(fileno(stdin), &read_fds))
                {
                        if (getc(stdin) == 'x')
@@ -430,7 +435,7 @@ void sig_handler(int sig) {
 }
 #endif
 
-int server_init()
+int server_init(void)
 {
 #ifdef _WIN32
        WORD wVersionRequested;
@@ -456,7 +461,7 @@ int server_init()
        return ERROR_OK;
 }
 
-int server_quit()
+int server_quit(void)
 {
        remove_services();