X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11.h;h=809c23fbf72998e5c74085800042d0ad5f5be943;hp=ae6a93ca84a54fb2dba5eb4943c9d7eb203c1fe6;hb=cbc13187c315227c0cf8d85fb0b92d0ba4a10dab;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea

diff --git a/src/target/arm11.h b/src/target/arm11.h
index ae6a93ca84..809c23fbf7 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -23,11 +23,7 @@
 #ifndef ARM11_H
 #define ARM11_H
 
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
-
-#define asizeof(x)	(sizeof(x) / sizeof((x)[0]))
+#include "armv4_5.h"
 
 #define NEW(type, variable, items)			\
 	type * variable = calloc(1, sizeof(type) * items)
@@ -80,6 +76,7 @@ enum arm11_debug_version
 
 struct arm11_common
 {
+	struct arm	arm;
 	struct target *	target;		/**< Reference back to the owner */
 
 	/** \name Processor type detection */
@@ -117,8 +114,15 @@ struct arm11_common
 
 	// GA
 	struct reg_cache *core_cache;
+
+	struct arm_jtag jtag_info;
 };
 
+static inline struct arm11_common *target_to_arm11(struct target *target)
+{
+	return container_of(target->arch_info, struct arm11_common,
+			arm);
+}
 
 /**
  * ARM11 DBGTAP instructions
@@ -182,11 +186,4 @@ struct arm11_reg_state
 	struct target *			target;
 };
 
-int arm11_register_commands(struct command_context_s *cmd_ctx);
-
-int arm11_read_etm(struct arm11_common * arm11, uint8_t address, uint32_t *value);
-int arm11_write_etm(struct arm11_common * arm11, uint8_t address, uint32_t value);
-
-
-
 #endif /* ARM11_H */