change #include "jtag.h" to <jtag/jtag.h>

[fw/openocd] / src / target / arm_jtag.h

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index fff3e79e405c44bb8dd01a70b1a54589d81ab940..6f03fc6eb3607a2a6f33e7c7c29c53407e8c4651 100644 (file)
--- 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,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,39 +23,37 @@
 #ifndef ARM_JTAG
 #define ARM_JTAG
 
-#include "types.h"
-#include "jtag.h"
+#include <jtag/jtag.h>
 
-typedef struct arm_jtag_s
+struct arm_jtag
 {
-       jtag_tap_t *tap;
-
-       u32 scann_size;
-       u32 scann_instr;
-       u32 cur_scan_chain;
-
-       u32 intest_instr;
-} arm_jtag_t;
-
-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);
-
-/* 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);
+       struct jtag_tap *tap;
+
+       uint32_t scann_size;
+       uint32_t scann_instr;
+       uint32_t cur_scan_chain;
+
+       uint32_t intest_instr;
+};
+
+int arm_jtag_set_instr(struct arm_jtag *jtag_info,
+               uint32_t new_instr, void *verify_capture);
+int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain);
+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 *)in) = 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 *)in) = le_to_h_u32(in);
+}
+
 
 #endif /* ARM_JTAG */