X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.h;h=f93245634adb3bd147f9f076b4c1cfa1f779af06;hb=4cc359794420dbe0aedba38bde0ee4d871cdb354;hp=70a2d9eec1ce9ddba5f1f33dbdab08bbf8370ab3;hpb=45a528ff3c0582f7d22b65d76d925f34a6956957;p=openocd.git

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 70a2d9eec1..f93245634a 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -50,8 +50,7 @@ struct armv7a_common
 	int common_magic;
 	struct reg_cache *core_cache;
 
-	/* arm adp debug port */
-	struct adiv5_dap swjdp_info;
+	struct adiv5_dap dap;
 
 	/* Core Debug Unit */
 	struct arm_dpm dpm;
@@ -63,11 +62,9 @@ struct armv7a_common
 	struct armv4_5_mmu_common armv4_5_mmu;
 
 	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 armv7a_common *