target_t -> struct target

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

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index ab078e28798df2922ef5718bc8368132a8d5ba1d..4a0a1ed903baf44eeb846a8101fed70d1353750e 100644 (file)
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -23,27 +23,18 @@
 #ifndef ARM7TDMI_H
 #define ARM7TDMI_H
 
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
 #include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
 
-#define        ARM7TDMI_COMMON_MAGIC 0x00a700a7
-
-typedef struct arm7tdmi_common_s
+/* FIXME we don't really need a separate arm7tdmi struct any more...
+ * remove it, the arm7/arm9 common struct suffices.
+ */
+struct arm7tdmi_common
 {
-       int common_magic;
-       char *variant;
-       void *arch_info;
-       arm7_9_common_t arm7_9_common;
-} arm7tdmi_common_t;
-
-int arm7tdmi_register_commands(struct command_context_s *cmd_ctx);
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_tap_t *tap, const char *variant);
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm7tdmi_examine(struct target_s *target);
+       struct arm7_9_common arm7_9_common;
+};
 
+int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap);
+int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target *target);
+int arm7tdmi_examine(struct target *target);
 
 #endif /* ARM7TDMI_H */