[Openocd-svn] r1841 - trunk/src/jtag

[kc8apf at B. <kc...@ma...>]

Author: kc8apf
Date: 2009-05-20 06:48:11 +0200 (Wed, 20 May 2009)
New Revision: 1841

Modified:
   trunk/src/jtag/jtag.c
Log:
Author: Michael Bruck <mb...@di...>
    - rename local variable x to num_taps in interface_jtag_add_ir_scan



Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-20 04:47:20 UTC (rev 1840)
+++ trunk/src/jtag/jtag.c	2009-05-20 04:48:11 UTC (rev 1841)
@@ -592,10 +592,11 @@
 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 @@
 	/* 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 @@
 		}
 		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,8 +654,9 @@
 		/* 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;
 }