jtag_tap_t -> struct jtag_tap

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

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index b98c022489e7dc653cfd160149316bc2b3cf819f..e311659f22b2ded2eaee8dfe09b6299cdf3e0efe 100644 (file)
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -23,22 +23,27 @@
 #ifndef ARM966E_H
 #define ARM966E_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 
 #define        ARM966E_COMMON_MAGIC 0x20f920f9
 
 typedef struct arm966e_common_s
 {
-       int common_magic;
        arm9tdmi_common_t arm9tdmi_common;
-       u32 cp15_control_reg;
+       int common_magic;
+       uint32_t cp15_control_reg;
 } arm966e_common_t;
 
-extern int arm966e_read_cp15(target_t *target, int reg_addr, u32 *value);
-extern int arm966e_write_cp15(target_t *target, int reg_addr, u32 value);
+static inline struct arm966e_common_s *
+target_to_arm966(struct target_s *target)
+{
+       return container_of(target->arch_info, struct arm966e_common_s,
+                       arm9tdmi_common.arm7_9_common.armv4_5_common);
+}
+
+int arm966e_init_arch_info(target_t *target,
+               arm966e_common_t *arm966e, struct jtag_tap *tap);
+int arm966e_register_commands(struct command_context_s *cmd_ctx);
+int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
 
 #endif /* ARM966E_H */