X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=9b73d4ea8439a80c7b6cb41a3f2c02e59dda9a3b;hb=2934ac454e32b21b1bd624189745d9f21ee79b46;hp=22538ca58b887f629f9fce53ccaa530337b2b5d7;hpb=374127301ec1d72033b9d573b72c7abdfd61990d;p=openocd.git

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 22538ca58b..9b73d4ea84 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -31,11 +29,9 @@
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
+int arm_jtag_set_instr_inner(struct jtag_tap *tap,
 		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
-	struct jtag_tap *tap;
-	tap = jtag_info->tap;
 	struct scan_field field;
 	uint8_t t[4];
 
@@ -59,20 +55,18 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
 int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
 	int retval = ERROR_OK;
-	uint32_t values[1];
-	int num_bits[1];
 
-	values[0] = new_scan_chain;
-	num_bits[0] = jtag_info->scann_size;
+	uint8_t out_value[4];
+	buf_set_u32(out_value, 0, jtag_info->scann_size, new_scan_chain);
+	struct scan_field field = { .num_bits = jtag_info->scann_size, .out_value = out_value, };
 
-	retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state);
+	retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->scann_instr, NULL, end_state);
 	if (retval != ERROR_OK)
 		return retval;
 
-	jtag_add_dr_out(jtag_info->tap,
+	jtag_add_dr_scan(jtag_info->tap,
 			1,
-			num_bits,
-			values,
+			&field,
 			end_state);
 
 	jtag_info->cur_scan_chain = new_scan_chain;