interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- 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
This commit is contained in:
ntfreak 2008-02-11 09:11:50 +00:00
parent fdf58f74e0
commit 01dd733dad
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/tms470.c
View File

@ -430,7 +430,7 @@ tms470_try_flash_keys( target_t * target,
if (!(fmmstat & 0x08)) if (!(fmmstat & 0x08))
{ {
unsigned i; unsigned i;
u32 fmmac2, fmbptr, fmbac2, fmbbusy, orig_fmregopt; u32 fmbptr, fmbac2, orig_fmregopt;
target_write_u32( target, 0xFFE8BC04, fmmstat & ~0x07 ); target_write_u32( target, 0xFFE8BC04, fmmstat & ~0x07 );
@ -496,7 +496,6 @@ tms470_try_flash_keys( target_t * target,
int int
tms470_unlock_flash( struct flash_bank_s * bank ) tms470_unlock_flash( struct flash_bank_s * bank )
{ {
tms470_flash_bank_t * tms470_info = bank->driver_priv;
target_t * target = bank->target; target_t * target = bank->target;
const u32 * p_key_sets[5]; const u32 * p_key_sets[5];
unsigned i, key_set_count; unsigned i, key_set_count;
@ -869,7 +868,6 @@ tms470_erase( struct flash_bank_s * bank,
int last ) int last )
{ {
tms470_flash_bank_t *tms470_info = bank->driver_priv; tms470_flash_bank_t *tms470_info = bank->driver_priv;
target_t *target = bank->target;
int sector, result = ERROR_OK; int sector, result = ERROR_OK;
if (!tms470_info->device_ident_reg) if (!tms470_info->device_ident_reg)

18
src/server/telnet_server.c
View File

@ -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) int telnet_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
{ {
struct command_context_s *cmd_ctx = 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]; char buffer[512];
switch (event) 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); target->type->arch_state(target, buffer, 512);
buffer[511] = 0; buffer[511] = 0;
command_print(cmd_ctx, "%s", buffer); command_print(cmd_ctx, "%s", buffer);
telnet_prompt(connection);
t_con->suppress_prompt = 1;
break; break;
case TARGET_EVENT_RESUMED: case TARGET_EVENT_RESUMED:
command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target)); command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target));
telnet_prompt(connection);
t_con->suppress_prompt = 1;
break; break;
default: default:
break; break;
@ -109,7 +103,6 @@ int telnet_new_connection(connection_t *connection)
telnet_connection->line_cursor = 0; telnet_connection->line_cursor = 0;
telnet_connection->option_size = 0; telnet_connection->option_size = 0;
telnet_connection->prompt = strdup("> "); telnet_connection->prompt = strdup("> ");
telnet_connection->suppress_prompt = 0;
telnet_connection->state = TELNET_STATE_DATA; telnet_connection->state = TELNET_STATE_DATA;
/* output goes through telnet connection */ /* output goes through telnet connection */
@ -251,9 +244,6 @@ int telnet_input(connection_t *connection)
continue; 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 = command_run_line(command_context, t_con->line)) != ERROR_OK)
{ {
if (retval == ERROR_COMMAND_CLOSE_CONNECTION) if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
@ -287,14 +277,8 @@ int telnet_input(connection_t *connection)
t_con->history[t_con->current_history] = strdup(""); t_con->history[t_con->current_history] = strdup("");
} }
if (!t_con->suppress_prompt) /* output prompt after command */
{
telnet_prompt(connection); telnet_prompt(connection);
}
else
{
t_con->suppress_prompt = 0;
}
t_con->line_size = 0; t_con->line_size = 0;
t_con->line_cursor = 0; t_con->line_cursor = 0;

1
src/server/telnet_server.h
View File

@ -44,7 +44,6 @@ enum telnet_states
typedef struct telnet_connection_s typedef struct telnet_connection_s
{ {
char *prompt; char *prompt;
int suppress_prompt;
enum telnet_states state; enum telnet_states state;
char line[TELNET_LINE_MAX_SIZE]; char line[TELNET_LINE_MAX_SIZE];
int line_size; int line_size;