tcl: introduce using_(jtag|swd|hla) helpers and use them in reset handler

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

diff --git a/src/server/server.h b/src/server/server.h
index b6ff5ed932fbeb7ff1085dfc85729a9644b534fb..b444939729d9c7107a721879296736e222cc5411 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -21,7 +21,7 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef SERVER_H
@@ -55,9 +55,9 @@ typedef int (*input_handler_t)(struct connection *connection);
 typedef int (*connection_closed_handler_t)(struct connection *connection);
 
 struct service {
-       const char *name;
+       char *name;
        enum connection_type type;
-       const char *port;
+       char *port;
        unsigned short portnumber;
        int fd;
        struct sockaddr_in sin;
@@ -87,11 +87,11 @@ int connection_write(struct connection *connection, const void *data, int len);
 int connection_read(struct connection *connection, void *data, int len);
 
 /**
- * Used by server_loop(), defined in server_stubs.c or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_prelude(void);
 /**
- * Used by server_loop(), defined in server_stubs.c or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_postlude(void);
 
@@ -101,14 +101,9 @@ void openocd_sleep_postlude(void);
  * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter
  * to receive the specified port number.
  */
-#define SERVER_PIPE_COMMAND() \
-       COMMAND_HELPER(server_pipe_command, const char **out)
-SERVER_PIPE_COMMAND();
+COMMAND_HELPER(server_pipe_command, char **out);
 
-#define SERVER_PORT_COMMAND() \
-       COMMAND_HELPER(server_port_command, unsigned short *out)
-
-SERVER_PORT_COMMAND();
+COMMAND_HELPER(server_port_command, unsigned short *out);
 
 #define ERROR_SERVER_REMOTE_CLOSED             (-400)
 #define ERROR_CONNECTION_REJECTED              (-401)