jtag_tap_t -> struct jtag_tap

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

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index b3ece44ec35cdbf6a4843f2f49383668c3dffade..da0f7722bd714ead01927c1c503d444aca4104b8 100644 (file)
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -25,17 +25,15 @@
 
 #include "embeddedice.h"
 
-#define        ARM7TDMI_COMMON_MAGIC 0x00a700a7
-
+/* FIXME we don't really need a separate arm7tdmi struct any more...
+ * remove it, the arm7/arm9 common struct suffices.
+ */
 typedef struct arm7tdmi_common_s
 {
-       int common_magic;
-       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);
+int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap);
 int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm7tdmi_examine(struct target_s *target);