Menu
▾
▴
[Openocd-svn] r1709 - trunk/src/server
|
From: <zw...@ma...> - 2009-05-11 06:22:26
|
Author: zwelch
Date: 2009-05-11 06:22:15 +0200 (Mon, 11 May 2009)
New Revision: 1709
Modified:
trunk/src/server/gdb_server.c
trunk/src/server/gdb_server.h
trunk/src/server/httpd.c
trunk/src/server/server.c
trunk/src/server/server.h
trunk/src/server/tcl_server.c
trunk/src/server/telnet_server.c
Log:
Audit and eliminate redundant #include directives from src/server.
Modified: trunk/src/server/gdb_server.c
===================================================================
--- trunk/src/server/gdb_server.c 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/gdb_server.c 2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,24 +27,14 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "gdb_server.h"
-
+#include "target_request.h"
+#include "register.h"
#include "server.h"
-#include "log.h"
-#include "binarybuffer.h"
-#include "jtag.h"
-#include "breakpoints.h"
#include "flash.h"
-#include "target.h"
-#include "target_request.h"
-#include "configuration.h"
+#include "image.h"
+#include "jtag.h"
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
#if 0
#define _DEBUG_GDB_IO_
Modified: trunk/src/server/gdb_server.h
===================================================================
--- trunk/src/server/gdb_server.h 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/gdb_server.h 2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,9 +27,9 @@
#define GDB_SERVER_H
#include "target.h"
-#include "server.h"
-#include "image.h"
+struct image_s;
+
#define GDB_BUFFER_SIZE 16384
typedef struct gdb_connection_s
@@ -39,7 +39,7 @@
int buf_cnt;
int ctrl_c;
enum target_state frontend_state;
- image_t *vflash_image;
+ struct image_s *vflash_image;
int closed;
int busy;
int noack_mode;
Modified: trunk/src/server/httpd.c
===================================================================
--- trunk/src/server/httpd.c 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/httpd.c 2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,30 +27,13 @@
#include "config.h"
#endif
-#include "replacements.h"
-
-#include "server.h"
-
-#include "log.h"
#include "telnet_server.h"
#include "target.h"
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <microhttpd.h>
#include <pthread.h>
#include <signal.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <microhttpd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
int loadFile(const char *name, void **data, size_t *len);
Modified: trunk/src/server/server.c
===================================================================
--- trunk/src/server/server.c 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/server.c 2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,25 +27,16 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "server.h"
-
-#include "log.h"
-#include "telnet_server.h"
#include "target.h"
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <signal.h>
+
#ifndef _WIN32
#include <netinet/tcp.h>
#endif
+
service_t *services = NULL;
/* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
Modified: trunk/src/server/server.h
===================================================================
--- trunk/src/server/server.h 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/server.h 2009-05-11 04:22:15 UTC (rev 1709)
@@ -26,10 +26,12 @@
#ifndef SERVER_H
#define SERVER_H
-#include "command.h"
-#include "binarybuffer.h"
-#include "replacements.h"
+#include "log.h"
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
enum connection_type
{
CONNECTION_TCP,
Modified: trunk/src/server/tcl_server.c
===================================================================
--- trunk/src/server/tcl_server.c 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/tcl_server.c 2009-05-11 04:22:15 UTC (rev 1709)
@@ -21,18 +21,9 @@
#include "config.h"
#endif
-#include <stdarg.h>
#include "tcl_server.h"
-#include "log.h"
-#include "command.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
#define TCL_SERVER_VERSION "TCL Server 0.1"
#define TCL_MAX_LINE (4096)
Modified: trunk/src/server/telnet_server.c
===================================================================
--- trunk/src/server/telnet_server.c 2009-05-11 04:21:24 UTC (rev 1708)
+++ trunk/src/server/telnet_server.c 2009-05-11 04:22:15 UTC (rev 1709)
@@ -27,22 +27,9 @@
#include "config.h"
#endif
-#include "replacements.h"
-
#include "telnet_server.h"
-
-#include "server.h"
-#include "log.h"
-#include "command.h"
-#include "target.h"
#include "target_request.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-
static unsigned short telnet_port = 0;
int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
|
