summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-21 04:54:38 +0000
committerkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-21 04:54:38 +0000
commit788cad7244ce92a1d60ffd594b2f3174c20c7074 (patch)
tree15da21e59494c20db36773943319f3d8211cd7c1 /src
parent73e31653fccbaa7e62edfbd0f5a0e27241be9436 (diff)
downloadopenocd+libswd-788cad7244ce92a1d60ffd594b2f3174c20c7074.tar.gz
openocd+libswd-788cad7244ce92a1d60ffd594b2f3174c20c7074.tar.bz2
openocd+libswd-788cad7244ce92a1d60ffd594b2f3174c20c7074.tar.xz
openocd+libswd-788cad7244ce92a1d60ffd594b2f3174c20c7074.zip
Author: Michael Bruck <mbruck@digenius.de>
-jtag.c, interface_jtag_add_ir_scan() [1/2]: - remove temporary scan_size and use tap->ir_length instead - slight loop restructuring to reduce indentation level git-svn-id: svn://svn.berlios.de/openocd/trunk@1868 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/jtag/jtag.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 70d83f2e..ebdd4a3d 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -643,23 +643,20 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, const scan_field_t
{
int found = 0;
- size_t scan_size = tap->ir_length;
-
- /* search the list */
for (int j = 0; j < in_num_fields; j++)
{
- if (tap == in_fields[j].tap)
- {
- found = 1;
+ if (tap != in_fields[j].tap)
+ continue;
- tap->bypass = 0;
-
- assert(in_fields[j].num_bits == tap->ir_length); /* input fields must have the same length as the TAP's IR */
+ found = 1;
- cmd_queue_scan_field_clone(field, in_fields + j);
+ tap->bypass = 0;
- break;
- }
+ assert(in_fields[j].num_bits == tap->ir_length); /* input fields must have the same length as the TAP's IR */
+
+ cmd_queue_scan_field_clone(field, in_fields + j);
+
+ break;
}
if (!found)
@@ -668,13 +665,13 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, const scan_field_t
tap->bypass = 1;
field->tap = tap;
- field->num_bits = scan_size;
- field->out_value = buf_set_ones(cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+ field->num_bits = tap->ir_length;
+ field->out_value = buf_set_ones(cmd_queue_alloc(CEIL(tap->ir_length, 8)), tap->ir_length);
field->in_value = NULL; /* do not collect input for tap's in bypass */
}
/* update device information */
- buf_cpy(field->out_value, tap->cur_instr, scan_size);
+ buf_cpy(field->out_value, tap->cur_instr, tap->ir_length);
field++;
}