X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fserver%2Ftcl_server.c;h=7c8e130ba702a8f2b660725143a08d27d938e236;hb=f32492c74f29f7efd0d73f8118d0b988bc24f56a;hp=b5bdbc28935f2fb74b5da7632ed8e2783eaa9865;hpb=f2cbaba3cc4af99db7b4f2682c2e0dd4467655e3;p=fw%2Fopenocd

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index b5bdbc289..7c8e130ba 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -37,17 +37,17 @@ struct tcl_connection {
 static unsigned short tcl_port = 6666;
 
 /* handlers */
-static int tcl_new_connection(connection_t *connection);
-static int tcl_input(connection_t *connection);
-static int tcl_output(connection_t *connection, const void *buf, ssize_t len);
-static int tcl_closed(connection_t *connection);
+static int tcl_new_connection(struct connection *connection);
+static int tcl_input(struct connection *connection);
+static int tcl_output(struct connection *connection, const void *buf, ssize_t len);
+static int tcl_closed(struct connection *connection);
 
 /* write data out to a socket.
  *
  * this is a blocking write, so the return value must equal the length, if
  * that is not the case then flag the connection with an output error.
  */
-int tcl_output(connection_t *connection, const void *data, ssize_t len)
+int tcl_output(struct connection *connection, const void *data, ssize_t len)
 {
 	ssize_t wlen;
 	struct tcl_connection *tclc;
@@ -66,7 +66,7 @@ int tcl_output(connection_t *connection, const void *data, ssize_t len)
 }
 
 /* connections */
-static int tcl_new_connection(connection_t *connection)
+static int tcl_new_connection(struct connection *connection)
 {
 	struct tcl_connection *tclc;
 
@@ -79,15 +79,16 @@ static int tcl_new_connection(connection_t *connection)
 	return ERROR_OK;
 }
 
-static int tcl_input(connection_t *connection)
+static int tcl_input(struct connection *connection)
 {
+	Jim_Interp *interp = (Jim_Interp *)connection->cmd_ctx->interp;
 	int retval;
 	int i;
 	ssize_t rlen;
 	const char *result;
 	int reslen;
 	struct tcl_connection *tclc;
-	char in[256];
+	unsigned char in[256];
 
 	rlen = read_socket(connection->fd, &in, sizeof(in));
 	if (rlen <= 0) {
@@ -146,7 +147,7 @@ static int tcl_input(connection_t *connection)
 	return ERROR_OK;
 }
 
-static int tcl_closed(connection_t *connection)
+static int tcl_closed(struct connection *connection)
 {
 	/* cleanup connection context */
 	if (connection->priv) {
@@ -166,7 +167,9 @@ int tcl_init(void)
 		return ERROR_OK;
 	}
 
-	retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1, tcl_new_connection, tcl_input, tcl_closed, NULL);
+	retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1,
+			&tcl_new_connection, &tcl_input,
+			&tcl_closed, NULL);
 	return retval;
 }
 
@@ -175,10 +178,20 @@ COMMAND_HANDLER(handle_tcl_port_command)
 	return CALL_COMMAND_HANDLER(server_port_command, &tcl_port);
 }
 
-int tcl_register_commands(command_context_t *cmd_ctx)
+static const struct command_registration tcl_command_handlers[] = {
+	{
+		.name = "tcl_port",
+		.handler = handle_tcl_port_command,
+		.mode = COMMAND_CONFIG,
+		.help = "Specify port on which to listen "
+			"for incoming Tcl syntax.  "
+			"No arguments reports Tcl port; zero disables.",
+		.usage = "[port_num]",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+int tcl_register_commands(struct command_context *cmd_ctx)
 {
-	register_command(cmd_ctx, NULL, "tcl_port",
-			handle_tcl_port_command, COMMAND_CONFIG,
-			"port on which to listen for incoming TCL syntax");
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, tcl_command_handlers);
 }