X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=9b73d4ea8439a80c7b6cb41a3f2c02e59dda9a3b;hb=c06ac3b5d357351e34438452a72a14e534910c6f;hp=ccc1adf497c321f7a84cf0e18d6f7827a9e102d0;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f;p=openocd.git

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index ccc1adf497..9b73d4ea84 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     *
@@ -13,106 +16,79 @@
  *   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
 #include "config.h"
 #endif
 
 #include "arm_jtag.h"
 
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
-
-#include <stdlib.h>
+#if 0
+#define _ARM_JTAG_SCAN_N_CHECK_
+#endif
 
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr)
+int arm_jtag_set_instr_inner(struct jtag_tap *tap,
+		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
-	jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-	
-	if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
-	{
-		scan_field_t field;
-	
-		field.device = jtag_info->chain_pos;
-		field.num_bits = device->ir_length;
-		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
-		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
-		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
-		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
-		
-		jtag_add_ir_scan(1, &field, -1);
-		
-		free(field.out_value);
+	struct scan_field field;
+	uint8_t t[4];
+
+	field.num_bits = tap->ir_length;
+	field.out_value = t;
+	buf_set_u32(t, 0, field.num_bits, new_instr);
+	field.in_value = NULL;
+
+	if (no_verify_capture == NULL)
+		jtag_add_ir_scan(tap, &field, end_state);
+	else {
+		/* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
+		 * have special verification code.
+		 */
+		jtag_add_ir_scan_noverify(tap, &field, end_state);
 	}
-	
+
 	return ERROR_OK;
 }
 
-int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
-	if(jtag_info->cur_scan_chain != new_scan_chain)
-	{
-		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 = &scan_n_capture;
-		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
-		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
-		
-		arm_jtag_set_instr(jtag_info, jtag_info->scann_instr);
-		jtag_add_dr_scan(1, &field, -1);
-		
-		jtag_info->cur_scan_chain = new_scan_chain;
-		
-		free(field.out_value);
-	}
-	
-	return ERROR_OK;
+	int retval = ERROR_OK;
+
+	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->tap, jtag_info->scann_instr, NULL, end_state);
+	if (retval != ERROR_OK)
+		return retval;
+
+	jtag_add_dr_scan(jtag_info->tap,
+			1,
+			&field,
+			end_state);
+
+	jtag_info->cur_scan_chain = new_scan_chain;
+
+	return retval;
 }
 
-int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+static int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
-	arm_jtag_t *jtag_info = priv;
-	
+	struct arm_jtag *jtag_info = priv;
+
 	if (event == JTAG_TRST_ASSERTED)
-	{
 		jtag_info->cur_scan_chain = 0;
-	}
-	
+
 	return ERROR_OK;
 }
 
-int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
+int arm_jtag_setup_connection(struct arm_jtag *jtag_info)
 {
 	jtag_info->scann_instr = 0x2;
 	jtag_info->cur_scan_chain = 0;
 	jtag_info->intest_instr = 0xc;
 
-	jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
-	
-	return ERROR_OK;
-}
-
-int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv)
-{
-	u32 *dest = priv;
-	
-	*dest = flip_u32(buf_get_u32(in_buf, 0, 32), 32);
-	
-	return ERROR_OK;
+	return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }