add openocd.h for top-level declarations

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

diff --git a/src/server/server.c b/src/server/server.c
index ada0a6024dfc5b23a2ef302fe028394a77f78b9c..92292eb59b7ee605727e16211d224c88833210f8 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -29,6 +29,7 @@
 
 #include "server.h"
 #include "target.h"
+#include "openocd.h"
 
 #include <signal.h>
 
@@ -37,7 +38,7 @@
 #endif
 
 
-service_t *services = NULL;
+struct service *services = NULL;
 
 /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
 static int shutdown_openocd = 0;
@@ -45,14 +46,14 @@ static int shutdown_openocd = 0;
 /* set when using pipes rather than tcp */
 int server_use_pipes = 0;
 
-int add_connection(service_t *service, command_context_t *cmd_ctx)
+int add_connection(struct service *service, struct command_context *cmd_ctx)
 {
        socklen_t address_size;
-       connection_t *c, **p;
+       struct connection *c, **p;
        int retval;
        int flag = 1;
 
-       c = malloc(sizeof(connection_t));
+       c = malloc(sizeof(struct connection));
        c->fd = -1;
        memset(&c->sin, 0, sizeof(c->sin));
        c->cmd_ctx = copy_command_context(cmd_ctx);
@@ -109,10 +110,10 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
        return ERROR_OK;
 }
 
-int remove_connection(service_t *service, connection_t *connection)
+int remove_connection(struct service *service, struct connection *connection)
 {
-       connection_t **p = &service->connections;
-       connection_t *c;
+       struct connection **p = &service->connections;
+       struct connection *c;
 
        /* find connection */
        while ((c = *p))
@@ -141,10 +142,10 @@ int remove_connection(service_t *service, connection_t *connection)
 
 int add_service(char *name, enum connection_type type, unsigned short port, int max_connections, new_connection_handler_t new_connection_handler, input_handler_t input_handler, connection_closed_handler_t connection_closed_handler, void *priv)
 {
-       service_t *c, **p;
+       struct service *c, **p;
        int so_reuseaddr_option = 1;
 
-       c = malloc(sizeof(service_t));
+       c = malloc(sizeof(struct service));
 
        c->name = strdup(name);
        c->type = type;
@@ -232,8 +233,8 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
 
 int remove_service(unsigned short port)
 {
-       service_t **p = &services;
-       service_t *c;
+       struct service **p = &services;
+       struct service *c;
 
        /* find service */
        while ((c = *p))
@@ -260,12 +261,12 @@ int remove_service(unsigned short port)
 
 int remove_services(void)
 {
-       service_t *c = services;
+       struct service *c = services;
 
        /* loop service */
        while (c)
        {
-               service_t *next = c->next;
+               struct service *next = c->next;
 
                if (c->name)
                        free(c->name);
@@ -285,12 +286,9 @@ int remove_services(void)
        return ERROR_OK;
 }
 
-extern void openocd_sleep_prelude(void);
-extern void openocd_sleep_postlude(void);
-
-int server_loop(command_context_t *command_context)
+int server_loop(struct command_context *command_context)
 {
-       service_t *service;
+       struct service *service;
 
        /* used in select() */
        fd_set read_fds;
@@ -329,7 +327,7 @@ int server_loop(command_context_t *command_context)
 
                        if (service->connections)
                        {
-                               connection_t *c;
+                               struct connection *c;
 
                                for (c = service->connections; c; c = c->next)
                                {
@@ -423,7 +421,7 @@ int server_loop(command_context_t *command_context)
                        /* handle activity on connections */
                        if (service->connections)
                        {
-                               connection_t *c;
+                               struct connection *c;
 
                                for (c = service->connections; c;)
                                {
@@ -431,7 +429,7 @@ int server_loop(command_context_t *command_context)
                                        {
                                                if ((retval = service->input(c)) != ERROR_OK)
                                                {
-                                                       connection_t *next = c->next;
+                                                       struct connection *next = c->next;
                                                        if (service->type == CONNECTION_PIPE)
                                                        {
                                                                /* if connection uses a pipe then shutdown openocd on error */
@@ -541,7 +539,7 @@ COMMAND_HANDLER(handle_shutdown_command)
        return ERROR_COMMAND_CLOSE_CONNECTION;
 }
 
-int server_register_commands(command_context_t *context)
+int server_register_commands(struct command_context *context)
 {
        register_command(context, NULL, "shutdown",
                        handle_shutdown_command, COMMAND_ANY,