#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;
- void *arch_info;
- arm7_9_common_t arm7_9_common;
-} arm7tdmi_common_t;
+ struct arm7_9_common arm7_9_common;
+};
-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_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm7tdmi_examine(struct target_s *target);
+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 */