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

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

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index 2479b5485e47304951faab0e82c457fb4a1a5fab..a3a68837af7d0022234a93bc1bfc094fb1728c70 100644 (file)
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -17,27 +17,27 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM720T_H
 #define ARM720T_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm7tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
 #define        ARM720T_COMMON_MAGIC 0xa720a720
 
-typedef struct arm720t_common_s
+struct arm720t_common {
+       struct arm7_9_common arm7_9_common;
+       uint32_t common_magic;
+       struct armv4_5_mmu_common armv4_5_mmu;
+       uint32_t cp15_control_reg;
+       uint32_t fsr_reg;
+       uint32_t far_reg;
+};
+
+static inline struct arm720t_common *target_to_arm720(struct target *target)
 {
-       int common_magic;
-       armv4_5_mmu_common_t armv4_5_mmu;
-       arm7tdmi_common_t arm7tdmi_common;
-       u32 cp15_control_reg;
-       u32 fsr;
-       u32 far;
-} arm720t_common_t;
+       return container_of(target->arch_info, struct arm720t_common, arm7_9_common.arm);
+}
 
 #endif /* ARM720T_H */