X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=25eae9608f795b81b4a8fda5f9bdae1b8839c7e5;hb=ef1cfb23947bd32798077c6abb5c25a049460ae9;hp=070af2137b4b783a3e4d1398e5d383e1e99b5290;hpb=167ce32a7cb99962e6ae8f8c6d36b0999c16888c;p=openocd.git

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 070af2137b..25eae9608f 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -40,10 +43,11 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handl
 	if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
 	{
 		scan_field_t field;
+		u8 t[4];
 	
 		field.device = jtag_info->chain_pos;
 		field.num_bits = device->ir_length;
-		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
+		field.out_value = t;
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 		field.out_mask = NULL;
 		field.in_value = NULL;
@@ -51,10 +55,7 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handl
 		field.in_check_mask = NULL;
 		field.in_handler = handler;
 		field.in_handler_priv = NULL;
-		jtag_add_ir_scan(1, &field, -1, NULL);
-		
-		
-		free(field.out_value);
+		jtag_add_ir_scan(1, &field, -1);
 	}
 	
 	return ERROR_OK;
@@ -64,31 +65,20 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
 {
 	if(jtag_info->cur_scan_chain != new_scan_chain)
 	{
-#ifdef _ARM_JTAG_SCAN_N_CHECK_
-		u8 scan_n_check_value = 1 << (jtag_info->scann_size - 1);
-#endif
-		scan_field_t field;
-		
-		field.device = jtag_info->chain_pos;
-		field.num_bits = jtag_info->scann_size;
-		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
-		buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);
-		field.out_mask = NULL;
-		field.in_value = NULL;
-#ifdef _ARM_JTAG_SCAN_N_CHECK_
-		jtag_set_check_value(&field, &scan_n_check_value, NULL, NULL, NULL);
-#else
-		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
-#endif 
+		u32 values[1];
+		int num_bits[1];
 		
+		values[0]=new_scan_chain;
+		num_bits[0]=jtag_info->scann_size;
 		
 		arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
-		jtag_add_dr_scan(1, &field, -1, NULL);
+		jtag_add_dr_out(jtag_info->chain_pos, 
+				1,
+				num_bits,
+				values,
+				-1);
 		
 		jtag_info->cur_scan_chain = new_scan_chain;
-		
-		free(field.out_value);
 	}
 	
 	return ERROR_OK;