imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup the handle_jtag_khz_command routine:

Browse Source 
- Separate retval assignments from logical tests.
- Simplify logical tests.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2110 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-08 10:54:41 +00:00
parent 620ecedf42
commit 47a1185d5d
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/jtag/jtag.c
View File

@ -2167,41 +2167,39 @@ static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cm
static 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 > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
int retval = ERROR_OK;
int cur_speed = 0;
if(argc == 1)
if (argc == 1)
{
LOG_DEBUG("handle jtag khz");
jtag_set_speed_khz(strtoul(args[0], NULL, 0));
if (jtag != NULL)
{
LOG_DEBUG("have interface set up");
int speed_div1;
if ((retval=jtag->khz(jtag_get_speed_khz(), &speed_div1))!=ERROR_OK)
retval = jtag->khz(jtag_get_speed_khz(), &speed_div1);
if (ERROR_OK != retval)
{
jtag_set_speed_khz(0);
return retval;
}
cur_speed = jtag_speed = speed_div1;
retval=jtag->speed(cur_speed);
} else
{
hasKHz = true;
retval = jtag->speed(cur_speed);
}
} else if (argc==0)
{
} else
{
return ERROR_COMMAND_SYNTAX_ERROR;
else
hasKHz = true;
}
cur_speed = jtag_get_speed_khz();
if (jtag!=NULL)
cur_speed = jtag_get_speed_khz();
if (jtag != NULL)
{
if ((retval=jtag->speed_div(jtag_speed, &cur_speed))!=ERROR_OK)
retval = jtag->speed_div(jtag_speed, &cur_speed);
if (ERROR_OK != retval)
return retval;
}