arm: error propagation of arm_jtag_set_instr

[openocd] / src / target / armv7m.h

diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 55265054bd000ac04a5f75467e043fa3eea0c33c..8ef380088b4094d09e6efd2847562c183f4518c1 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 adiv5_dap swjdp_info;
+       struct adiv5_dap dap;
 
        uint32_t demcr;
 
@@ -121,10 +121,9 @@ struct armv7m_common
        int (*write_core_reg)(struct target *target, unsigned num);
 
        int (*examine_debug_reason)(struct target *target);
-       void (*post_debug_entry)(struct target *target);
+       int (*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 *