/***************************************************************************
- * Copyright (C) 2008 *
+ * Copyright (C) 2010 Øyvind Harboe *
+ * oyvind.harboe@zylin.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* 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. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#endif
#include "tcl_server.h"
+#include <target/target.h>
-
-#define TCL_SERVER_VERSION "TCL Server 0.1"
-#define TCL_MAX_LINE (4096)
+#define TCL_SERVER_VERSION "TCL Server 0.1"
+#define TCL_MAX_LINE (4096)
struct tcl_connection {
int tc_linedrop;
int tc_lineoffset;
char tc_line[TCL_MAX_LINE];
- int tc_outerror; /* flag an output error */
+ int tc_outerror;/* flag an output error */
+ enum target_state tc_laststate;
+ bool tc_notify;
};
-static unsigned short tcl_port = 6666;
+static char *tcl_port;
/* handlers */
static int tcl_new_connection(struct connection *connection);
static int tcl_output(struct connection *connection, const void *buf, ssize_t len);
static int tcl_closed(struct connection *connection);
+static int tcl_target_callback_event_handler(struct target *target,
+ enum target_event event, void *priv)
+{
+ struct connection *connection = priv;
+ struct tcl_connection *tclc;
+ char buf[256];
+
+ tclc = connection->priv;
+
+ if (tclc->tc_notify) {
+ snprintf(buf, sizeof(buf), "type target_event event %s\r\n\x1a", target_event_name(event));
+ tcl_output(connection, buf, strlen(buf));
+ }
+
+ if (tclc->tc_laststate != target->state) {
+ tclc->tc_laststate = target->state;
+ if (tclc->tc_notify) {
+ snprintf(buf, sizeof(buf), "type target_state state %s\r\n\x1a", target_state_name(target));
+ tcl_output(connection, buf, strlen(buf));
+ }
+ }
+
+ return ERROR_OK;
+}
+
+static int tcl_target_callback_reset_handler(struct target *target,
+ enum target_reset_mode reset_mode, void *priv)
+{
+ struct connection *connection = priv;
+ struct tcl_connection *tclc;
+ char buf[256];
+
+ tclc = connection->priv;
+
+ if (tclc->tc_notify) {
+ snprintf(buf, sizeof(buf), "type target_reset mode %s\r\n\x1a", target_reset_mode_name(reset_mode));
+ tcl_output(connection, buf, strlen(buf));
+ }
+
+ return ERROR_OK;
+}
+
/* write data out to a socket.
*
* this is a blocking write, so the return value must equal the length, if
if (tclc->tc_outerror)
return ERROR_SERVER_REMOTE_CLOSED;
- wlen = write_socket(connection->fd, data, len);
+ wlen = connection_write(connection, data, len);
+
if (wlen == len)
return ERROR_OK;
memset(tclc, 0, sizeof(struct tcl_connection));
connection->priv = tclc;
+
+ struct target *target = get_current_target(connection->cmd_ctx);
+ if (target != NULL)
+ tclc->tc_laststate = target->state;
+
+ /* store the connection object on cmd_ctx so we can access it from command handlers */
+ connection->cmd_ctx->output_handler_priv = connection;
+
+ target_register_event_callback(tcl_target_callback_event_handler, connection);
+ target_register_reset_callback(tcl_target_callback_reset_handler, connection);
+
return ERROR_OK;
}
static int tcl_input(struct connection *connection)
{
- Jim_Interp *interp = (Jim_Interp *)connection->priv;
+ 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));
+ rlen = connection_read(connection, &in, sizeof(in));
if (rlen <= 0) {
if (rlen < 0)
LOG_ERROR("error during read: %s", strerror(errno));
return ERROR_CONNECTION_REJECTED;
/* push as much data into the line as possible */
- for (i = 0; i < rlen; i++)
- {
- if (!isprint(in[i]) && !isspace(in[i]))
- {
- /* drop this line */
- tclc->tc_linedrop = 1;
- continue;
- }
-
+ for (i = 0; i < rlen; i++) {
/* buffer the data */
tclc->tc_line[tclc->tc_lineoffset] = in[i];
if (tclc->tc_lineoffset < TCL_MAX_LINE)
else
tclc->tc_linedrop = 1;
- if (in[i] != '\n')
+ /* ctrl-z is end of command. When testing from telnet, just
+ * press ctrl-z a couple of times first to put telnet into the
+ * mode where it will send 0x1a in response to pressing ctrl-z
+ */
+ if (in[i] != '\x1a')
continue;
/* process the line */
if (retval != ERROR_OK)
return retval;
#undef ESTR
- }
- else {
+ } else {
tclc->tc_line[tclc->tc_lineoffset-1] = '\0';
- retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection",1);
+ retval = command_run_line(connection->cmd_ctx, tclc->tc_line);
result = Jim_GetString(Jim_GetResult(interp), &reslen);
retval = tcl_output(connection, result, reslen);
if (retval != ERROR_OK)
return retval;
- if (memchr(result, '\n', reslen) == NULL)
- tcl_output(connection, "\n", 1);
+ /* Always output ctrl-d as end of line to allow multiline results */
+ tcl_output(connection, "\x1a", 1);
}
tclc->tc_lineoffset = 0;
free(connection->priv);
connection->priv = NULL;
}
+
+ target_unregister_event_callback(tcl_target_callback_event_handler, connection);
+ target_unregister_reset_callback(tcl_target_callback_reset_handler, connection);
+
return ERROR_OK;
}
-int tcl_init(struct command_context *cmd_ctx)
+int tcl_init(void)
{
- int retval;
-
- if (tcl_port == 0)
- {
- LOG_INFO("tcl port disabled");
+ if (strcmp(tcl_port, "disabled") == 0) {
+ LOG_INFO("tcl server disabled");
return ERROR_OK;
}
- retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1,
- &tcl_new_connection, &tcl_input,
- &tcl_closed, cmd_ctx->interp);
- return retval;
+ return add_service("tcl", tcl_port, 1,
+ &tcl_new_connection, &tcl_input,
+ &tcl_closed, NULL);
}
COMMAND_HANDLER(handle_tcl_port_command)
{
- return CALL_COMMAND_HANDLER(server_port_command, &tcl_port);
+ return CALL_COMMAND_HANDLER(server_pipe_command, &tcl_port);
+}
+
+COMMAND_HANDLER(handle_tcl_notifications_command)
+{
+ struct connection *connection = NULL;
+ struct tcl_connection *tclc = NULL;
+
+ if (CMD_CTX->output_handler_priv != NULL)
+ connection = CMD_CTX->output_handler_priv;
+
+ if (connection != NULL && !strcmp(connection->service->name, "tcl")) {
+ tclc = connection->priv;
+ return CALL_COMMAND_HANDLER(handle_command_parse_bool, &tclc->tc_notify, "Target Notification output is");
+ } else {
+ LOG_ERROR("%s: can only be called from the tcl server", CMD_NAME);
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
}
static const struct command_registration tcl_command_handlers[] = {
{
.name = "tcl_port",
- .handler = &handle_tcl_port_command,
- .mode = COMMAND_CONFIG,
- .help = "port on which to listen "
- "for incoming TCL syntax",
- .usage = "<port>",
+ .handler = handle_tcl_port_command,
+ .mode = COMMAND_ANY,
+ .help = "Specify port on which to listen "
+ "for incoming Tcl syntax. "
+ "Read help on 'gdb_port'.",
+ .usage = "[port_num]",
+ },
+ {
+ .name = "tcl_notifications",
+ .handler = handle_tcl_notifications_command,
+ .mode = COMMAND_EXEC,
+ .help = "Target Notification output",
+ .usage = "[on|off]",
},
COMMAND_REGISTRATION_DONE
};
int tcl_register_commands(struct command_context *cmd_ctx)
{
+ tcl_port = strdup("6666");
return register_commands(cmd_ctx, NULL, tcl_command_handlers);
}
Code Review / openocd.git / blobdiff