ARM926 uses the new inheritance/nesting scheme

[openocd.git] / src / target / armv7m.h

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index f3a74221ce9d3ea06bba73b5a680efbaa218b2ef..217f0e38c9ff7144520441dbe65ccc763c02eb75 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -41,7 +41,7 @@ enum armv7m_mode
        ARMV7M_MODE_ANY = -1
 };
 
-extern char* armv7m_mode_strings[];
+extern char *armv7m_mode_strings[];
 
 enum armv7m_regtype
 {
@@ -99,7 +99,6 @@ typedef struct armv7m_common_s
        int exception_number;
        swjdp_common_t swjdp_info;
 
-
        /* Direct processor core register read and writes */
        int (*load_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, uint32_t num, uint32_t *value);
        int (*store_core_reg_u32)(struct target_s *target, enum armv7m_regtype type, uint32_t num, uint32_t value);
@@ -108,15 +107,18 @@ typedef struct armv7m_common_s
        int (*write_core_reg)(struct target_s *target, int num);
 
        int (*examine_debug_reason)(target_t *target);
-       void (*pre_debug_entry)(target_t *target);
        void (*post_debug_entry)(target_t *target);
 
        void (*pre_restore_context)(target_t *target);
        void (*post_restore_context)(target_t *target);
-
-       void *arch_info;
 } armv7m_common_t;
 
+static inline struct armv7m_common_s *
+target_to_armv7m(struct target_s *target)
+{
+       return target->arch_info;
+}
+
 typedef struct armv7m_algorithm_s
 {
        int common_magic;