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

Author: Michael Bruck <mbruck@digenius.de> 

-jtag.c, interface_jtag_add_dr_scan():
            - use pointer 'field' instead of scan->fields[field_count]
            - restructure the main loop to clearly separate the two cases: TAP is not bypassed / TAP is bypassed
            - add an assert that each non-bypassed TAP receives at least one field
            - add an assert that checks that no superfluous input fields were passed



git-svn-id: svn://svn.berlios.de/openocd/trunk@1866 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
kc8apf 2009-05-21 04:50:00 +00:00
parent 7e3fd48b6a
commit e007342669
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/jtag/jtag.c
View File

@ -827,9 +827,6 @@ void jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, tap_stat
*/ */
int MINIDRIVER(interface_jtag_add_dr_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state) int MINIDRIVER(interface_jtag_add_dr_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{ {
int j;
int field_count = 0;
/* count devices in bypass */ /* count devices in bypass */
size_t bypass_devices = 0; size_t bypass_devices = 0;
@ -854,53 +851,46 @@ int MINIDRIVER(interface_jtag_add_dr_scan)(int in_num_fields, const scan_field_t
scan->fields = out_fields; scan->fields = out_fields;
scan->end_state = state; scan->end_state = state;
scan_field_t * field = out_fields; /* keep track where we insert data */
/* loop over all enabled TAPs */
for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap)) for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
{ {
int found = 0; /* if TAP is not bypassed insert matching input fields */
for (j = 0; j < in_num_fields; j++) if (!tap->bypass)
{ {
if (tap == in_fields[j].tap) scan_field_t * start_field = field; /* keep initial position for assert() */
{
found = 1;
cmd_queue_scan_field_clone(scan->fields + field_count, in_fields + j);
field_count++; for (int j = 0; j < in_num_fields; j++)
}
}
if (!found)
{
#ifdef _DEBUG_JTAG_IO_
/* if a device isn't listed, the BYPASS register should be selected */
if (! tap->bypass)
{ {
LOG_ERROR("BUG: no scan data for a device not in BYPASS"); if (tap != in_fields[j].tap)
exit(-1); continue;
cmd_queue_scan_field_clone(field, in_fields + j);
field++;
} }
#endif
/* program the scan field to 1 bit length, and ignore it's value */ assert(field > start_field); /* must have at least one input field per not bypassed TAP */
scan->fields[field_count].tap = tap;
scan->fields[field_count].num_bits = 1;
scan->fields[field_count].out_value = NULL;
scan->fields[field_count].in_value = NULL;
field_count++;
} }
/* if a TAP is bypassed, generated a dummy bit*/
else else
{ {
#ifdef _DEBUG_JTAG_IO_ field->tap = tap;
/* if a device is listed, the BYPASS register must not be selected */ field->num_bits = 1;
if (tap->bypass) field->out_value = NULL;
{ field->in_value = NULL;
LOG_ERROR("BUG: scan data for a device in BYPASS");
exit(-1); field++;
}
#endif
} }
} }
/* field_count represents the true number of fields setup*/ assert(field == out_fields + scan->num_fields); /* no superfluous input fields permitted */
scan->num_fields = field_count;
return ERROR_OK; return ERROR_OK;
} }