src/target: remove 'extern' and wrap headers

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

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 21dee1e5453c760d92eb36c3e13bd2328fe28055..8d0ee5016577bedf7949b8a4da7a2b6a94b26a7f 100644 (file)
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -29,13 +29,21 @@
 
 typedef struct arm966e_common_s
 {
-       int common_magic;
        arm9tdmi_common_t arm9tdmi_common;
+       int common_magic;
        uint32_t cp15_control_reg;
 } arm966e_common_t;
 
-extern int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap);
-extern int arm966e_register_commands(struct command_context_s *cmd_ctx);
-extern int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t 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, jtag_tap_t *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 */