Retire jtag_add_dr_out

The out only version of jtag_add_dr_scan smells like a bogus optimization
that complicates the minidriver API for questionable gain.

The function was only used by four old ARM targets. Rewrite the callers
to use the generic function and remove all implementations.

Change-Id: I13b643687ee8ed6bc9b6336e7096c34f40ea96af
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1801
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

2 files changed, 15 insertions, 73 deletions

diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 2ae31bc5..d7fa4376 100644
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -169,52 +169,6 @@ static inline void shiftValueInner(const enum tap_state state,
 #endif
 }
 
-static inline void interface_jtag_add_dr_out_core(struct jtag_tap *target_tap,
-	int num_fields,
-	const int *num_bits,
-	const uint32_t *value,
-	enum tap_state end_state)
-{
-	enum tap_state pause_state = TAP_DRSHIFT;
-
-	struct jtag_tap *tap, *nextTap;
-	for (tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = nextTap) {
-		nextTap = jtag_tap_next_enabled(tap);
-		if (nextTap == NULL)
-			pause_state = end_state;
-		if (tap == target_tap) {
-			int j;
-			for (j = 0; j < (num_fields-1); j++)
-				shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[j], value[j]);
-			shiftValueInner(TAP_DRSHIFT, pause_state, num_bits[j], value[j]);
-		} else {
-			/* program the scan field to 1 bit length, and ignore it's value */
-			shiftValueInner(TAP_DRSHIFT, pause_state, 1, 0);
-		}
-	}
-}
-
-static inline void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
-	int num_fields,
-	const int *num_bits,
-	const uint32_t *value,
-	enum tap_state end_state)
-{
-
-	int singletap = (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL)) == NULL);
-	if ((singletap) && (num_fields == 3)) {
-		/* used by embeddedice_write_reg_inner() */
-		shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]);
-		shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[1], value[1]);
-		shiftValueInner(TAP_DRSHIFT, end_state, num_bits[2], value[2]);
-	} else if ((singletap) && (num_fields == 2)) {
-		/* used by arm7 code */
-		shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]);
-		shiftValueInner(TAP_DRSHIFT, end_state, num_bits[1], value[1]);
-	} else
-		interface_jtag_add_dr_out_core(target_tap, num_fields, num_bits, value, end_state);
-}
-
 #if BUILD_ZY1000_MASTER
 #define interface_jtag_add_callback(callback, in) callback(in)
 #define interface_jtag_add_callback4(callback, in, data1, data2, \
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index bcf46387..16c3e5d0 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -631,16 +631,6 @@ static void jtag_pre_post_bits(struct jtag_tap *tap, int *pre, int *post)
 	*post = post_bits;
 }
 
-#if 0
-static const int embeddedice_num_bits[] = {32, 6};
-	uint32_t values[2];
-
-	values[0] = value;
-	values[1] = (1 << 5) | reg_addr;
-
-	jtag_add_dr_out(tap, 2, embeddedice_num_bits, values, TAP_IDLE);
-#endif
-
 void embeddedice_write_dcc(struct jtag_tap *tap,
 	int reg_addr,
 	const uint8_t *buffer,
@@ -700,8 +690,7 @@ int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
 				uint32_t, const uint32_t *, size_t);
 		return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
 	} else {
-		static const int bits[] = {32, 2};
-		uint32_t values[] = {0, 0};
+		static const uint8_t zero;
 
 		/* FIX!!!!!! the target_write_memory() API started this nasty problem
 		 * with unaligned uint32_t * pointers... */
@@ -710,7 +699,7 @@ int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
 		while (--count > 0) {
 #if 1
 			/* Danger! This code doesn't update cmd_queue_cur_state, so
-			 * invoking jtag_add_pathmove() before jtag_add_dr_out() after
+			 * invoking jtag_add_pathmove() before jtag_add_dr_scan() after
 			 * this loop would fail!
 			 */
 			shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, pre_bits, 0);
@@ -750,15 +739,15 @@ int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
 				TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
 			};
 
-			values[0] = *t++;
-			values[0] |= (*t++<<8);
-			values[0] |= (*t++<<16);
-			values[0] |= (*t++<<24);
+			struct scan_field fields[2] = {
+					{ .num_bits = 32, .out_value = t },
+					{ .num_bits = 2, .out_value = &zero },
+			};
+			t += 4;
 
-			jtag_add_dr_out(tap,
+			jtag_add_dr_scan(tap,
 				2,
-				bits,
-				values,
+				fields,
 				TAP_IDLE);
 
 			jtag_add_pathmove(ARRAY_SIZE(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
@@ -766,18 +755,17 @@ int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
 #endif
 		}
 
-		values[0] = *t++;
-		values[0] |= (*t++<<8);
-		values[0] |= (*t++<<16);
-		values[0] |= (*t++<<24);
+		struct scan_field fields[2] = {
+				{ .num_bits = 32, .out_value = t },
+				{ .num_bits = 2, .out_value = &zero },
+		};
 
 		/* This will happen on the last iteration updating cmd_queue_cur_state
 		 * so we don't have to track it during the common code path
 		 */
-		jtag_add_dr_out(tap,
+		jtag_add_dr_scan(tap,
 			2,
-			bits,
-			values,
+			fields,
 			TAP_IDLE);
 
 		return jtag_execute_queue();