auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- jtag_khz/speed are now single parameter only. These are used

Browse Source 
from pre/post_reset event scripts. Adding the second parameter was
a mistake seen in retrospect. this gives precise control in post_reset
for *when* the post reset speed is set. The pre_reset event was
added *after* the second parameter to jtag_khz/speed
- the target implementations no longer gets involved in the reset mode
scheme. Either they reset a target into a halted mode or not.
target_process_reset()
detects if the reset halt failed or not.
- tcl target event names are now target_N_name.  Mainly internal
at this early stage, but best to get the naming right now.
- added hardcoded reset modes from gdb_server.c. I don't know precisely what
these defaults should be or if it should be made configurable. Perhaps some
hardcoded defaults will do for now and it can be made configurable later.
- bugfix in cortex_m3.c for reset_run_and_xxx?
- issue syntax error upon obsolete argument in target command instead of
printing message that will surely drown in the log

git-svn-id: svn://svn.berlios.de/openocd/trunk@849 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2008-07-21 15:59:41 +00:00
parent c1ee650a9a
commit dfbb9f3e89
18 changed files with 156 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/jtag/jtag.c
View File

@@ -140,7 +140,7 @@ int jtag_ntrst_delay = 0; /* default to no nTRST delay */
jtag_event_callback_t *jtag_event_callbacks;
/* speed in kHz*/
static int speed1 = 0, speed2 = 0;
static int speed_khz = 0;
/* flag if the kHz speed was defined */
static int hasKHz = 0;
@@ -240,7 +240,7 @@ jtag_interface_t *jtag = NULL;
/* configuration */
jtag_interface_t *jtag_interface = NULL;
int jtag_speed = 0;
int jtag_speed_post_reset = 0;
/* forward declarations */
@@ -1467,7 +1467,7 @@ int jtag_register_commands(struct command_context_s *cmd_ctx)
register_command(cmd_ctx, NULL, "interface", handle_interface_command,
COMMAND_CONFIG, NULL);
register_command(cmd_ctx, NULL, "jtag_speed", handle_jtag_speed_command,
COMMAND_ANY, "set jtag speed (if supported) <reset speed> [<post reset speed, default value is reset speed>]");
COMMAND_ANY, "set jtag speed (if supported)");
register_command(cmd_ctx, NULL, "jtag_khz", handle_jtag_khz_command,
COMMAND_ANY, "same as jtag_speed, except it takes maximum khz as arguments. 0 KHz = RTCK.");
register_command(cmd_ctx, NULL, "jtag_device", handle_jtag_device_command,
@@ -1510,9 +1510,7 @@ int jtag_interface_init(struct command_context_s *cmd_ctx)
}
if(hasKHz)
{
/*stay on "reset speed"*/
jtag_interface->khz(speed1, &jtag_speed);
jtag_interface->khz(speed2, &jtag_speed_post_reset);
jtag_interface->khz(speed_khz, &jtag_speed);
hasKHz = 0;
}
@@ -1849,79 +1847,67 @@ int handle_jtag_ntrst_delay_command(struct command_context_s *cmd_ctx, char *cmd
int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
int cur_speed = 0;
int retval=ERROR_OK;
if (argc != 0)
if (argc == 1)
{
if ((argc<1) || (argc>2))
return ERROR_COMMAND_SYNTAX_ERROR;
LOG_DEBUG("handle jtag speed");
if (argc >= 1)
cur_speed = jtag_speed = jtag_speed_post_reset = strtoul(args[0], NULL, 0);
if (argc == 2)
cur_speed = jtag_speed_post_reset = strtoul(args[1], NULL, 0);
int cur_speed = 0;
cur_speed = jtag_speed = strtoul(args[0], NULL, 0);
/* this command can be called during CONFIG,
* in which case jtag isn't initialized */
if (jtag)
{
jtag->speed_div(jtag_speed, &speed1);
jtag->speed_div(jtag_speed_post_reset, &speed2);
jtag->speed(cur_speed);
retval=jtag->speed(cur_speed);
}
}
command_print(cmd_ctx, "jtag_speed: %d, %d", jtag_speed, jtag_speed_post_reset);
} else if (argc == 0)
{
} else
{
retval=ERROR_COMMAND_SYNTAX_ERROR;
}
command_print(cmd_ctx, "jtag_speed: %d", jtag_speed);
return ERROR_OK;
return retval;
}
int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
int retval=ERROR_OK;
LOG_DEBUG("handle jtag khz");
if (argc>2)
return ERROR_COMMAND_SYNTAX_ERROR;
if(argc != 0)
if(argc == 1)
{
if (argc >= 1)
speed1 = speed2 = strtoul(args[0], NULL, 0);
if (argc == 2)
speed2 = strtoul(args[1], NULL, 0);
speed_khz = strtoul(args[0], NULL, 0);
if (jtag != NULL)
{
int cur_speed = 0;
LOG_DEBUG("have interface set up");
int speed_div1, speed_div2;
if (jtag->khz(speed1, &speed_div1)!=ERROR_OK)
int speed_div1;
if ((retval=jtag->khz(speed_khz, &speed_div1))!=ERROR_OK)
{
speed1 = speed2 = 0;
return ERROR_OK;
}
if (jtag->khz(speed2, &speed_div2)!=ERROR_OK)
{
speed1 = speed2 = 0;
return ERROR_OK;
speed_khz = 0;
return retval;
}
if (argc >= 1)
cur_speed = jtag_speed = jtag_speed_post_reset = speed_div1;
if (argc == 2)
cur_speed = jtag_speed_post_reset = speed_div2;
cur_speed = jtag_speed = speed_div1;
jtag->speed(cur_speed);
retval=jtag->speed(cur_speed);
} else
{
hasKHz = 1;
}
} else if (argc==0)
{
} else
{
retval=ERROR_COMMAND_SYNTAX_ERROR;
}
command_print(cmd_ctx, "jtag_khz: %d, %d", speed1, speed2);
return ERROR_OK;
command_print(cmd_ctx, "jtag_khz: %d", speed_khz);
return retval;
}
int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)