ETM: remove old mid-level ETM handle

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

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 5814c13decf2e4f184b4f1df3f26d8b89b2ebd03..2ad0321f1abf4fc27c9742a06fd729d005a24e1d 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -107,7 +107,6 @@ typedef struct armv7a_common_s
        /* Cache and Memory Management Unit */
        armv4_5_mmu_common_t armv4_5_mmu;
        armv4_5_common_t armv4_5_common;
-       void *arch_info;
 
 //     int (*full_context)(struct target_s *target);
 //     int (*read_core_reg)(struct target_s *target, int num, enum armv7a_mode mode);
@@ -120,7 +119,6 @@ typedef struct armv7a_common_s
                        uint32_t CRn, uint32_t CRm, uint32_t value);
 
        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);
@@ -128,6 +126,13 @@ typedef struct armv7a_common_s
 
 } armv7a_common_t;
 
+static inline struct armv7a_common_s *
+target_to_armv7a(struct target_s *target)
+{
+       return container_of(target->arch_info, struct armv7a_common_s,
+                       armv4_5_common);
+}
+
 typedef struct armv7a_algorithm_s
 {
        int common_magic;