Audit and eliminate redundant #include directives from src/server.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1709 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
7c7fed0283
commit
164cb6d04e
|
@ -27,24 +27,14 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "replacements.h"
|
|
||||||
|
|
||||||
#include "gdb_server.h"
|
#include "gdb_server.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 "target_request.h"
|
||||||
#include "configuration.h"
|
#include "register.h"
|
||||||
|
#include "server.h"
|
||||||
|
#include "flash.h"
|
||||||
|
#include "image.h"
|
||||||
|
#include "jtag.h"
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
#define _DEBUG_GDB_IO_
|
#define _DEBUG_GDB_IO_
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
#define GDB_SERVER_H
|
#define GDB_SERVER_H
|
||||||
|
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
#include "server.h"
|
|
||||||
#include "image.h"
|
struct image_s;
|
||||||
|
|
||||||
#define GDB_BUFFER_SIZE 16384
|
#define GDB_BUFFER_SIZE 16384
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ typedef struct gdb_connection_s
|
||||||
int buf_cnt;
|
int buf_cnt;
|
||||||
int ctrl_c;
|
int ctrl_c;
|
||||||
enum target_state frontend_state;
|
enum target_state frontend_state;
|
||||||
image_t *vflash_image;
|
struct image_s *vflash_image;
|
||||||
int closed;
|
int closed;
|
||||||
int busy;
|
int busy;
|
||||||
int noack_mode;
|
int noack_mode;
|
||||||
|
|
|
@ -27,30 +27,13 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "replacements.h"
|
|
||||||
|
|
||||||
#include "server.h"
|
|
||||||
|
|
||||||
#include "log.h"
|
|
||||||
#include "telnet_server.h"
|
#include "telnet_server.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
|
|
||||||
#include <command.h>
|
#include <microhttpd.h>
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <signal.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>"
|
#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);
|
int loadFile(const char *name, void **data, size_t *len);
|
||||||
|
|
|
@ -27,25 +27,16 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "replacements.h"
|
|
||||||
|
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
|
|
||||||
#include "log.h"
|
|
||||||
#include "telnet_server.h"
|
|
||||||
#include "target.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>
|
#include <signal.h>
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <netinet/tcp.h>
|
#include <netinet/tcp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
service_t *services = NULL;
|
service_t *services = NULL;
|
||||||
|
|
||||||
/* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
|
/* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
|
||||||
|
|
|
@ -26,9 +26,11 @@
|
||||||
#ifndef SERVER_H
|
#ifndef SERVER_H
|
||||||
#define SERVER_H
|
#define SERVER_H
|
||||||
|
|
||||||
#include "command.h"
|
#include "log.h"
|
||||||
#include "binarybuffer.h"
|
|
||||||
#include "replacements.h"
|
#ifdef HAVE_NETINET_IN_H
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
enum connection_type
|
enum connection_type
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,17 +21,8 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include "tcl_server.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_SERVER_VERSION "TCL Server 0.1"
|
||||||
#define TCL_MAX_LINE (4096)
|
#define TCL_MAX_LINE (4096)
|
||||||
|
|
|
@ -27,22 +27,9 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "replacements.h"
|
|
||||||
|
|
||||||
#include "telnet_server.h"
|
#include "telnet_server.h"
|
||||||
|
|
||||||
#include "server.h"
|
|
||||||
#include "log.h"
|
|
||||||
#include "command.h"
|
|
||||||
#include "target.h"
|
|
||||||
#include "target_request.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;
|
static unsigned short telnet_port = 0;
|
||||||
|
|
||||||
int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
|
int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
|
||||||
|
|
Loading…
Reference in New Issue