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 6bbac242c5ff1bc909e54d03b36c5a055c43ffa2..a3a68837af7d0022234a93bc1bfc094fb1728c70 100644 (file)
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM720T_H
 #define ARM720T_H
 
@@ -25,9 +26,8 @@
 
 #define        ARM720T_COMMON_MAGIC 0xa720a720
 
-struct arm720t_common
-{
-       struct arm7tdmi_common arm7tdmi_common;
+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;
@@ -35,11 +35,9 @@ struct arm720t_common
        uint32_t far_reg;
 };
 
-static inline struct arm720t_common *
-target_to_arm720(struct target *target)
+static inline struct arm720t_common *target_to_arm720(struct target *target)
 {
-       return container_of(target->arch_info, struct arm720t_common,
-                       arm7tdmi_common.arm7_9_common.armv4_5_common);
+       return container_of(target->arch_info, struct arm720t_common, arm7_9_common.arm);
 }
 
 #endif /* ARM720T_H */