diff options
| -rw-r--r-- | src/flash/tms470.c | 4 | ||||
| -rw-r--r-- | src/server/telnet_server.c | 20 | ||||
| -rw-r--r-- | src/server/telnet_server.h | 1 |
3 files changed, 3 insertions, 22 deletions
diff --git a/src/flash/tms470.c b/src/flash/tms470.c index b7adf5aa..c3f3e8cc 100644 --- a/src/flash/tms470.c +++ b/src/flash/tms470.c @@ -430,7 +430,7 @@ tms470_try_flash_keys( target_t * target, if (!(fmmstat & 0x08)) { unsigned i; - u32 fmmac2, fmbptr, fmbac2, fmbbusy, orig_fmregopt; + u32 fmbptr, fmbac2, orig_fmregopt; target_write_u32( target, 0xFFE8BC04, fmmstat & ~0x07 ); @@ -496,7 +496,6 @@ tms470_try_flash_keys( target_t * target, int tms470_unlock_flash( struct flash_bank_s * bank ) { - tms470_flash_bank_t * tms470_info = bank->driver_priv; target_t * target = bank->target; const u32 * p_key_sets[5]; unsigned i, key_set_count; @@ -869,7 +868,6 @@ tms470_erase( struct flash_bank_s * bank, int last ) { tms470_flash_bank_t *tms470_info = bank->driver_priv; - target_t *target = bank->target; int sector, result = ERROR_OK; if (!tms470_info->device_ident_reg) 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; |