ARM11: remove disabled register hooks

[openocd.git] / src / target / arm11.h

diff --git a/src/target/arm11.h b/src/target/arm11.h
index 6bc1a25133c85cd7f3c8d8a69d2ebf5bb07514e7..79f4b6b92e07481ce9549cbab7f84382a4a5e3ff 100644 (file)
--- 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)
@@ -41,12 +37,9 @@
 #define ZU             "%Iu"
 #endif
 
-#define ARM11_REGCACHE_MODEREGS                0
-#define ARM11_REGCACHE_FREGS           0
 
-#define ARM11_REGCACHE_COUNT           (20 +                                   \
-                                        23 * ARM11_REGCACHE_MODEREGS +                 \
-                                         9 * ARM11_REGCACHE_FREGS)
+/* TEMPORARY -- till we switch to the shared infrastructure */
+#define ARM11_REGCACHE_COUNT           20
 
 #define ARM11_TAP_DEFAULT                      TAP_INVALID
 
@@ -80,7 +73,8 @@ enum arm11_debug_version
 
 struct arm11_common
 {
-       target_t *      target;         /**< Reference back to the owner */
+       struct arm      arm;
+       struct target * target;         /**< Reference back to the owner */
 
        /** \name Processor type detection */
        /*@{*/
@@ -117,8 +111,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
@@ -179,14 +180,7 @@ enum arm11_sc7
 struct arm11_reg_state
 {
        uint32_t                                def_index;
-       target_t *                      target;
+       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 */