interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Edgar's naming convention fixes. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@629 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2008-04-30 09:34:31 +00:00
parent 06cdb3ad44
commit 95efa83ef5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jtag/jtag.c
View File

@ -1622,9 +1622,8 @@ static int default_khz(int khz, int *jtag_speed)
return ERROR_FAIL; return ERROR_FAIL;
} }
static int default_speedDiv(int speed, int *khz) static int default_speed_div(int speed, int *khz)
{ {
LOG_ERROR("Translation from jtag_speed to khz not implemented");
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1658,9 +1657,9 @@ int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char
{ {
jtag_interface->khz = default_khz; jtag_interface->khz = default_khz;
} }
if (jtag_interface->speedDiv == NULL) if (jtag_interface->speed_div == NULL)
{ {
jtag_interface->speedDiv = default_speedDiv; jtag_interface->speed_div = default_speed_div;
} }
return ERROR_OK; return ERROR_OK;
} }
@ -1859,8 +1858,8 @@ int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char
* in which case jtag isn't initialized */ * in which case jtag isn't initialized */
if (jtag) if (jtag)
{ {
jtag->speedDiv(jtag_speed, &speed1); jtag->speed_div(jtag_speed, &speed1);
jtag->speedDiv(jtag_speed_post_reset, &speed2); jtag->speed_div(jtag_speed_post_reset, &speed2);
jtag->speed(cur_speed); jtag->speed(cur_speed);
} }
} }
@ -1890,9 +1889,15 @@ int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, char *
LOG_DEBUG("have interface set up"); LOG_DEBUG("have interface set up");
int speed_div1, speed_div2; int speed_div1, speed_div2;
if (jtag->khz(speed1, &speed_div1)!=ERROR_OK) if (jtag->khz(speed1, &speed_div1)!=ERROR_OK)
{
speed1 = speed2 = 0;
return ERROR_OK; return ERROR_OK;
}
if (jtag->khz(speed2, &speed_div2)!=ERROR_OK) if (jtag->khz(speed2, &speed_div2)!=ERROR_OK)
{
speed1 = speed2 = 0;
return ERROR_OK; return ERROR_OK;
}
if (argc >= 1) if (argc >= 1)
cur_speed = jtag_speed = jtag_speed_post_reset = speed_div1; cur_speed = jtag_speed = jtag_speed_post_reset = speed_div1;

2
src/jtag/jtag.h
View File

@ -200,7 +200,7 @@ typedef struct jtag_interface_s
int (*khz)(int khz, int *jtag_speed); int (*khz)(int khz, int *jtag_speed);
/* returns the KHz for the provided JTAG speed. 0=RTCK. The function returns /* returns the KHz for the provided JTAG speed. 0=RTCK. The function returns
a failure if it can't support the KHz/RTCK. */ a failure if it can't support the KHz/RTCK. */
int (*speedDiv)(int speed, int *khz); int (*speed_div)(int speed, int *khz);
} jtag_interface_t; } jtag_interface_t;