ARM ADI-V5: cleanup CID/PID addressing

[openocd] / src / target / armv7m.h

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 89c5064ccc934354c0dd29c7bb1b46aaad43ad59..57d46ede496087dea325c78171836ea83e265298 100644 (file)
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -106,7 +106,7 @@ struct armv7m_common
        struct reg_cache *core_cache;
        enum armv7m_mode core_mode;
        int exception_number;
-       struct swjdp_common swjdp_info;
+       struct adiv5_dap dap;
 
        uint32_t demcr;
 
@@ -124,7 +124,6 @@ struct armv7m_common
        void (*post_debug_entry)(struct target *target);
 
        void (*pre_restore_context)(struct target *target);
-       void (*post_restore_context)(struct target *target);
 };
 
 static inline struct armv7m_common *