Fix make maintainer-clean for out-of-tree builds.

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

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 11f6bd611249e2fd6ec2f79f65aadb21c7abd3b4..10f8cbf825e774d17891cd5b4dd09932809f399c 100644 (file)
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -23,21 +23,20 @@
 #ifndef ARM_JTAG
 #define ARM_JTAG
 
-#include "types.h"
 #include "jtag.h"
 
 typedef struct arm_jtag_s
 {
        jtag_tap_t *tap;
-       
-       int scann_size;
+
+       u32 scann_size;
        u32 scann_instr;
-       int cur_scan_chain;
-       
+       u32 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_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);
 
@@ -57,5 +56,18 @@ 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);
 
+
+/* use this as a static so we can inline it in -O3 and refer to it via a pointer  */
+static __inline__ void arm7flip32(u8 *in)
+{
+       *((u32 *)in)=flip_u32(le_to_h_u32(in), 32);
+}
+
+static __inline__ void arm_le_to_h_u32(u8 *in)
+{
+       *((u32 *)in)=le_to_h_u32(in);
+}
+
+
 #endif /* ARM_JTAG */