Adds server_stubs.c to hold these routines, using automake logic to ensure it gets included under the right conditions.tags/v0.4.0-rc1
@@ -215,20 +215,6 @@ struct command_context *setup_command_handler(Jim_Interp *interp) | |||||
return cmd_ctx; | return cmd_ctx; | ||||
} | } | ||||
#if !BUILD_HTTPD && !BUILD_ECOSBOARD | |||||
/* implementations of OpenOCD that uses multithreading needs to know when | |||||
* OpenOCD is sleeping. No-op in vanilla OpenOCD | |||||
*/ | |||||
void openocd_sleep_prelude(void) | |||||
{ | |||||
} | |||||
void openocd_sleep_postlude(void) | |||||
{ | |||||
} | |||||
#endif | |||||
/* normally this is the main() function entry, but if OpenOCD is linked | /* normally this is the main() function entry, but if OpenOCD is linked | ||||
* into application, then this fn will not be invoked, but rather that | * into application, then this fn will not be invoked, but rather that | ||||
* application will have it's own implementation of main(). */ | * application will have it's own implementation of main(). */ | ||||
@@ -31,11 +31,6 @@ | |||||
*/ | */ | ||||
int openocd_main(int argc, char *argv[]); | int openocd_main(int argc, char *argv[]); | ||||
/// used by the server_loop() function in src/server/server.c | |||||
void openocd_sleep_prelude(void); | |||||
/// used by the server_loop() function in src/server/server.c | |||||
void openocd_sleep_postlude(void); | |||||
/// provides a hard-coded command environment setup | /// provides a hard-coded command environment setup | ||||
extern const char openocd_startup_tcl[]; | extern const char openocd_startup_tcl[]; | ||||
@@ -13,6 +13,10 @@ libserver_la_SOURCES = server.c telnet_server.c gdb_server.c | |||||
if HTTPD | if HTTPD | ||||
libserver_la_SOURCES += httpd.c | libserver_la_SOURCES += httpd.c | ||||
else | |||||
if !ECOSBOARD | |||||
libserver_la_SOURCES += server_stubs.c | |||||
endif | |||||
endif | endif | ||||
noinst_HEADERS += httpd.h | noinst_HEADERS += httpd.h | ||||
@@ -81,6 +81,15 @@ int server_loop(struct command_context *command_context); | |||||
int server_register_commands(struct command_context *context); | int server_register_commands(struct command_context *context); | ||||
/** | |||||
* Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c | |||||
*/ | |||||
void openocd_sleep_prelude(void); | |||||
/** | |||||
* Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c | |||||
*/ | |||||
void openocd_sleep_postlude(void); | |||||
/** | /** | ||||
* Defines an extended command handler function declaration to enable | * Defines an extended command handler function declaration to enable | ||||
* access to (and manipulation of) the server port number. | * access to (and manipulation of) the server port number. | ||||
@@ -0,0 +1,32 @@ | |||||
/*************************************************************************** | |||||
* Copyright (C) 2009 Zachary T Welch <zw@superlucidity.net> * | |||||
* * | |||||
* 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 * | |||||
* (at your option) any later version. * | |||||
* * | |||||
* This program is distributed in the hope that it will be useful, * | |||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of * | |||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | |||||
* GNU General Public License for more details. * | |||||
* * | |||||
* You should have received a copy of the GNU General Public License * | |||||
* along with this program; if not, write to the * | |||||
* Free Software Foundation, Inc., * | |||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * | |||||
***************************************************************************/ | |||||
#ifdef HAVE_CONFIG_H | |||||
#include <config.h> | |||||
#endif | |||||
#include "server.h" | |||||
void openocd_sleep_prelude(void) | |||||
{ | |||||
// no-op | |||||
} | |||||
void openocd_sleep_postlude(void) | |||||
{ | |||||
// no-op | |||||
} |