summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-20 04:48:11 +0000
committerkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-20 04:48:11 +0000
commit98e3541333e9c536479bcaf84b7704d99ee5b463 (patch)
tree94cf20e81e4ba29fc38ccb6a6e5a2c0dc61fea26
parent5c9c7af198459d536835a936beff677b16d01bec (diff)
downloadopenocd_libswd-98e3541333e9c536479bcaf84b7704d99ee5b463.tar.gz
openocd_libswd-98e3541333e9c536479bcaf84b7704d99ee5b463.tar.bz2
openocd_libswd-98e3541333e9c536479bcaf84b7704d99ee5b463.tar.xz
openocd_libswd-98e3541333e9c536479bcaf84b7704d99ee5b463.zip
Author: Michael Bruck <mbruck@digenius.de>
- rename local variable x to num_taps in interface_jtag_add_ir_scan git-svn-id: svn://svn.berlios.de/openocd/trunk@1841 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/jtag/jtag.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index a4f5d51d..28eca809 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -592,10 +592,11 @@ void jtag_add_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t st
int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
jtag_tap_t *tap;
- int x;
int nth_tap;
int scan_size = 0;
+ int num_taps = jtag_NumEnabledTaps();
+
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -606,9 +607,8 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
/* allocate memory for ir scan command */
cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
cmd->cmd.scan->ir_scan = true;
- x = jtag_NumEnabledTaps();
- cmd->cmd.scan->num_fields = x; /* one field per device */
- cmd->cmd.scan->fields = cmd_queue_alloc(x * sizeof(scan_field_t));
+ cmd->cmd.scan->num_fields = num_taps; /* one field per device */
+ cmd->cmd.scan->fields = cmd_queue_alloc(num_taps * sizeof(scan_field_t));
cmd->cmd.scan->end_state = state;
nth_tap = -1;
@@ -623,7 +623,7 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
}
nth_tap++;
- assert(nth_tap < x );
+ assert(nth_tap < num_taps);
scan_size = tap->ir_length;
cmd->cmd.scan->fields[nth_tap].tap = tap;
@@ -654,7 +654,8 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
/* update device information */
buf_cpy(cmd->cmd.scan->fields[nth_tap].out_value, tap->cur_instr, scan_size);
}
- assert(nth_tap == (x-1));
+
+ assert(nth_tap == (num_taps - 1));
return ERROR_OK;
}