X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.h;h=bb92abb84ba33d1faa4a49823eb0a7c8038418a1;hp=68eefbc66b538f1dba8b1911cfe17d5b565a3055;hb=9f021c2bc129f8f7c659c64ad19531bd8073264a;hpb=86173cdbddde781b19ac630602f2d450a59b32b5

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 68eefbc66b..bb92abb84b 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -16,58 +16,63 @@
  *   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/>. *
  ***************************************************************************/
-#ifndef ARM_JTAG
-#define ARM_JTAG
 
-#include "jtag.h"
+#ifndef OPENOCD_TARGET_ARM_JTAG_H
+#define OPENOCD_TARGET_ARM_JTAG_H
 
-typedef struct arm_jtag_s
-{
-	jtag_tap_t *tap;
+#include <jtag/jtag.h>
 
-	u32 scann_size;
-	u32 scann_instr;
-	u32 cur_scan_chain;
+struct arm_jtag {
+	struct jtag_tap *tap;
 
-	u32 intest_instr;
-} arm_jtag_t;
+	uint32_t scann_size;
+	uint32_t scann_instr;
+	uint32_t cur_scan_chain;
 
-extern int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr, void *verify_capture);
-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);
+	uint32_t intest_instr;
+};
 
-/* JTAG buffers to host, be and le buffers, flipping variants */
-int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field);
+int arm_jtag_set_instr_inner(struct jtag_tap *tap, uint32_t new_instr,
+		void *no_verify_capture,
+		tap_state_t end_state);
 
-/* JTAG buffers to host, be and le buffers */
-int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field_s *field);
-int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field_s *field);
+static inline int arm_jtag_set_instr(struct jtag_tap *tap,
+		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
+{
+	/* inline most common code path */
+	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+		return arm_jtag_set_instr_inner(tap, new_instr, no_verify_capture, end_state);
 
+	return ERROR_OK;
 
-/* use this as a static so we can inline it in -O3 and refer to it via a pointer  */
-static __inline__ void arm7flip32(uint8_t *in)
-{
-	*((u32 *)in)=flip_u32(le_to_h_u32(in), 32);
 }
 
-static __inline__ void arm_le_to_h_u32(uint8_t *in)
+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)
 {
-	*((u32 *)in)=le_to_h_u32(in);
+	/* 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);
 
-#endif /* ARM_JTAG */
+/* 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 /* OPENOCD_TARGET_ARM_JTAG_H */