X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm7tdmi.h;h=4a0a1ed903baf44eeb846a8101fed70d1353750e;hb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;hp=6e4da7a778d6db8083cf3a3d718f051c4c22e28a;hpb=8d73c2a9b0c00c870694a57f7cfbc23e354855ac;p=fw%2Fopenocd

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index 6e4da7a77..4a0a1ed90 100644
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,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, int chain_pos, 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 */