cortex_m: Fix single stepping will not return to debug mode sometimes

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

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index 104d1e032a89f6206b2d7a1e04a04b99a02d42d8..6c65db423340da6768bb32cefe15ad2d45c386e3 100644 (file)
--- 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     *
@@ -17,29 +20,15 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #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
-{
-       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, char *variant);
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 
+int arm7tdmi_init_arch_info(struct target *target,
+               struct arm7_9_common *arm7_9, struct jtag_tap *tap);
+int arm7tdmi_init_target(struct command_context *cmd_ctx,
+               struct target *target);
 
 #endif /* ARM7TDMI_H */