Cast 64-bit trace hit_counter to long long; fixes format warning.

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

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index e52bf78cd8a1ba9fdb094836b049bf08613feb09..3ba46b998f67f321b33ee80a720bbe890b7a3e24 100644 (file)
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -23,19 +23,13 @@
 #ifndef ARM9TDMI_H
 #define ARM9TDMI_H
 
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
 #include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
 
 #define        ARM9TDMI_COMMON_MAGIC 0x00a900a9
 
 typedef struct arm9tdmi_common_s
 {
        int common_magic;
-       char *variant;
        void *arch_info;
        arm7_9_common_t arm7_9_common;
 } arm9tdmi_common_t;
@@ -43,7 +37,7 @@ typedef struct arm9tdmi_common_s
 typedef struct arm9tdmi_vector_s
 {
        char *name;
-       u32 value;
+       uint32_t value;
 } arm9tdmi_vector_t;
 
 enum arm9tdmi_vector
@@ -60,13 +54,13 @@ enum arm9tdmi_vector
 
 extern int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm9tdmi_examine(struct target_s *target);
-extern int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, int chain_pos, const char *variant);
+extern int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap);
 extern int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
 
-extern int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int sysspeed);
-extern int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in);
+extern int arm9tdmi_clock_out(arm_jtag_t *jtag_info, uint32_t instr, uint32_t out, uint32_t *in, int sysspeed);
+extern int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, uint32_t *in);
 extern int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, int be); 
-extern void arm9tdmi_read_core_regs(target_t *target, u32 mask, u32* core_regs[16]);
-extern void arm9tdmi_write_core_regs(target_t *target, u32 mask, u32 core_regs[16]);
+extern void arm9tdmi_read_core_regs(target_t *target, uint32_t mask, uint32_t* core_regs[16]);
+extern void arm9tdmi_write_core_regs(target_t *target, uint32_t mask, uint32_t core_regs[16]);
 
 #endif /* ARM9TDMI_H */