Asynchronous output information from e.g. a halt is now displayed again.
git-svn-id: svn://svn.berlios.de/openocd/trunk@474 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
a3f35e348e
commit
29fc9b2596
|
@ -172,6 +172,10 @@ int telnet_new_connection(connection_t *connection)
|
||||||
|
|
||||||
target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
|
target_register_event_callback(telnet_target_callback_event_handler, connection->cmd_ctx);
|
||||||
|
|
||||||
|
log_add_callback(telnet_log_callback, connection);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return ERROR_OK;
|
return ERROR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,12 +290,8 @@ int telnet_input(connection_t *connection)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
log_add_callback(telnet_log_callback, connection);
|
|
||||||
|
|
||||||
retval = command_run_line(command_context, t_con->line);
|
retval = command_run_line(command_context, t_con->line);
|
||||||
|
|
||||||
log_remove_callback(telnet_log_callback, connection);
|
|
||||||
|
|
||||||
if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
|
if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
|
||||||
{
|
{
|
||||||
return ERROR_SERVER_REMOTE_CLOSED;
|
return ERROR_SERVER_REMOTE_CLOSED;
|
||||||
|
@ -535,6 +535,8 @@ int telnet_connection_closed(connection_t *connection)
|
||||||
telnet_connection_t *t_con = connection->priv;
|
telnet_connection_t *t_con = connection->priv;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
log_remove_callback(telnet_log_callback, connection);
|
||||||
|
|
||||||
if (t_con->prompt)
|
if (t_con->prompt)
|
||||||
{
|
{
|
||||||
free(t_con->prompt);
|
free(t_con->prompt);
|
||||||
|
|
Loading…
Reference in New Issue