X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7a.h;h=621761d73cef939387bc05e92deadd49da968446;hp=663e5d92d14237eeca437fd5c6646e7da99ef0d7;hb=1d9fba8c1488c3774c8bde737c2d658b1f525d09;hpb=0a1b7dcfc40385f09b5eb088cd97d6ff25a5816d

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 663e5d92d1..621761d73c 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -19,11 +19,11 @@
 #ifndef ARMV7A_H
 #define ARMV7A_H
 
-#include <target/arm_adi_v5.h>
-#include <target/arm.h>
-#include <target/armv4_5_mmu.h>
-#include <target/armv4_5_cache.h>
-#include <target/arm_dpm.h>
+#include "arm_adi_v5.h"
+#include "arm.h"
+#include "armv4_5_mmu.h"
+#include "armv4_5_cache.h"
+#include "arm_dpm.h"
 
 enum
 {
@@ -50,8 +50,7 @@ struct armv7a_common
 	int common_magic;
 	struct reg_cache *core_cache;
 
-	/* arm adp debug port */
-	struct swjdp_common swjdp_info;
+	struct adiv5_dap dap;
 
 	/* Core Debug Unit */
 	struct arm_dpm dpm;
@@ -66,8 +65,6 @@ struct armv7a_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 armv7a_common *