Fix regressions in previous series of cleanp, caused by r2092.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2093 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
14d6605cc9
commit
3363851781
|
@ -246,7 +246,7 @@ jtag_tap_t *jtag_all_taps(void)
|
||||||
int jtag_tap_count(void)
|
int jtag_tap_count(void)
|
||||||
{
|
{
|
||||||
return jtag_num_taps;
|
return jtag_num_taps;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned jtag_tap_count_enabled(void)
|
unsigned jtag_tap_count_enabled(void)
|
||||||
{
|
{
|
||||||
|
@ -1064,12 +1064,12 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap_s *tap)
|
||||||
tap->dotted_name, tap->expected_ids[ii]);
|
tap->dotted_name, tap->expected_ids[ii]);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Try to examine chain layout according to IEEE 1149.1 §12
|
/* Try to examine chain layout according to IEEE 1149.1 §12
|
||||||
*/
|
*/
|
||||||
static int jtag_examine_chain(void)
|
static int jtag_examine_chain(void)
|
||||||
{
|
{
|
||||||
u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4];
|
u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4];
|
||||||
unsigned device_count = 0;
|
unsigned device_count = 0;
|
||||||
|
|
||||||
|
@ -1093,7 +1093,7 @@ static int jtag_examine_chain(void)
|
||||||
{
|
{
|
||||||
/* LSB must not be 0, this indicates a device in bypass */
|
/* LSB must not be 0, this indicates a device in bypass */
|
||||||
LOG_WARNING("Tap/Device does not have IDCODE");
|
LOG_WARNING("Tap/Device does not have IDCODE");
|
||||||
idcode=0;
|
idcode = 0;
|
||||||
|
|
||||||
bit_count += 1;
|
bit_count += 1;
|
||||||
}
|
}
|
||||||
|
@ -1484,12 +1484,12 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
|
||||||
return ERROR_OK;
|
return ERROR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
Jim_SetResult_sprintf( goi->interp,
|
Jim_SetResult_sprintf(goi->interp,
|
||||||
"newtap: %s missing required parameters",
|
"newtap: %s missing required parameters",
|
||||||
pTap->dotted_name);
|
pTap->dotted_name);
|
||||||
jtag_tap_free(pTap);
|
jtag_tap_free(pTap);
|
||||||
return JIM_ERR;
|
return JIM_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
|
static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue