summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-11 09:11:50 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-11 09:11:50 +0000
commit01dd733dadc3508ba8f3abf8de87248c835891df (patch)
tree8855a567f35bbad95152b36ff8ec0d763ff8b49c /src/server
parentfdf58f74e0cbc1a23ba74f9c1a7dae3260a36fae (diff)
downloadopenocd_libswd-01dd733dadc3508ba8f3abf8de87248c835891df.tar.gz
openocd_libswd-01dd733dadc3508ba8f3abf8de87248c835891df.tar.bz2
openocd_libswd-01dd733dadc3508ba8f3abf8de87248c835891df.tar.xz
openocd_libswd-01dd733dadc3508ba8f3abf8de87248c835891df.zip
- telnet prompt behaves correctly for new synchronous halt/resume/reset commands
- removed unused variables in tms470.c git-svn-id: svn://svn.berlios.de/openocd/trunk@290 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/server')
-rw-r--r--src/server/telnet_server.c20
-rw-r--r--src/server/telnet_server.h1
2 files changed, 2 insertions, 19 deletions
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 5353369a..3a74f5ac 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -70,8 +70,6 @@ int telnet_output(struct command_context_s *cmd_ctx, char* line)
int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
{
struct command_context_s *cmd_ctx = priv;
- connection_t *connection = cmd_ctx->output_handler_priv;
- telnet_connection_t *t_con = connection->priv;
char buffer[512];
switch (event)
@@ -81,13 +79,9 @@ int telnet_target_callback_event_handler(struct target_s *target, enum target_ev
target->type->arch_state(target, buffer, 512);
buffer[511] = 0;
command_print(cmd_ctx, "%s", buffer);
- telnet_prompt(connection);
- t_con->suppress_prompt = 1;
break;
case TARGET_EVENT_RESUMED:
command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target));
- telnet_prompt(connection);
- t_con->suppress_prompt = 1;
break;
default:
break;
@@ -109,7 +103,6 @@ int telnet_new_connection(connection_t *connection)
telnet_connection->line_cursor = 0;
telnet_connection->option_size = 0;
telnet_connection->prompt = strdup("> ");
- telnet_connection->suppress_prompt = 0;
telnet_connection->state = TELNET_STATE_DATA;
/* output goes through telnet connection */
@@ -251,9 +244,6 @@ int telnet_input(connection_t *connection)
continue;
}
- /* we're running a command, so we need a prompt
- * if the output handler is called, this gets set again */
- t_con->suppress_prompt = 0;
if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK)
{
if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
@@ -287,14 +277,8 @@ int telnet_input(connection_t *connection)
t_con->history[t_con->current_history] = strdup("");
}
- if (!t_con->suppress_prompt)
- {
- telnet_prompt(connection);
- }
- else
- {
- t_con->suppress_prompt = 0;
- }
+ /* output prompt after command */
+ telnet_prompt(connection);
t_con->line_size = 0;
t_con->line_cursor = 0;
diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h
index 7b4b4a22..738efa56 100644
--- a/src/server/telnet_server.h
+++ b/src/server/telnet_server.h
@@ -44,7 +44,6 @@ enum telnet_states
typedef struct telnet_connection_s
{
char *prompt;
- int suppress_prompt;
enum telnet_states state;
char line[TELNET_LINE_MAX_SIZE];
int line_size;