X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.h;h=d22deae16b5f14b0bab7209459ffaa2f33f72c31;hb=9b6de72c2ba149ac6f3e11d6d0dd3030bf7b19f9;hp=227a8d58249c3a744e9b8df80812411e537de6e0;hpb=167ce32a7cb99962e6ae8f8c6d36b0999c16888c;p=openocd.git

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 227a8d5824..d22deae16b 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007-2010 Ø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     *
@@ -17,42 +20,65 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM_JTAG
 #define ARM_JTAG
 
-#include "types.h"
-#include "jtag.h"
+#include <jtag/jtag.h>
+
+struct arm_jtag {
+	struct jtag_tap *tap;
+
+	uint32_t scann_size;
+	uint32_t scann_instr;
+	uint32_t cur_scan_chain;
+
+	uint32_t intest_instr;
+};
 
-typedef struct arm_jtag_s
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,
+		void *no_verify_capture,
+		tap_state_t end_state);
+
+static inline int arm_jtag_set_instr(struct arm_jtag *jtag_info,
+		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
-	int chain_pos;
-	
-	int scann_size;
-	u32 scann_instr;
-	int cur_scan_chain;
-	
-	u32 intest_instr;
-} arm_jtag_t;
-
-extern int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr, in_handler_t handler);
-extern int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain);
-extern int arm_jtag_setup_connection(arm_jtag_t *jtag_info);
-
-/* JTAG buffers to host, be and le buffers, flipping variants */
-int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le16_flip(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be32_flip(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be16_flip(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv, struct scan_field_s *field);
-
-/* JTAG buffers to host, be and le buffers */
-int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le32(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le16(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be32(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be16(u8 *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_8(u8 *in_buf, void *priv, struct scan_field_s *field);
+	/* inline most common code path */
+	struct jtag_tap *tap;
+	tap = jtag_info->tap;
+	assert(tap != NULL);
 
-#endif /* ARM_JTAG */
+	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+		return arm_jtag_set_instr_inner(jtag_info, new_instr, no_verify_capture, end_state);
+
+	return ERROR_OK;
+
+}
 
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state);
+static inline int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
+{
+	/* inline most common code path */
+	int retval = ERROR_OK;
+	if (jtag_info->cur_scan_chain != new_scan_chain)
+		return arm_jtag_scann_inner(jtag_info, new_scan_chain, end_state);
+
+	return retval;
+}
+
+int arm_jtag_setup_connection(struct arm_jtag *jtag_info);
+
+/* use this as a static so we can inline it in -O3 and refer to it via a pointer  */
+static inline void arm7flip32(jtag_callback_data_t arg)
+{
+	uint8_t *in = (uint8_t *)arg;
+	*((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32);
+}
+
+static inline void arm_le_to_h_u32(jtag_callback_data_t arg)
+{
+	uint8_t *in = (uint8_t *)arg;
+	*((uint32_t *)arg) = le_to_h_u32(in);
+}
+
+#endif /* ARM_JTAG */