ARM: use <target/arm.h> not armv4_5.h

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

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 53bf4721c84c52b85bef1d72f68ed622f360938c..97038d8c6e8e256eef1ddd8fe8cfdd0d43232d40 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,9 +23,9 @@
 #ifndef XSCALE_H
 #define XSCALE_H
 
-#include "armv4_5.h"
-#include "armv4_5_mmu.h"
-#include "trace.h"
+#include <target/arm.h>
+#include <target/armv4_5_mmu.h>
+#include <target/trace.h>
 
 #define        XSCALE_COMMON_MAGIC 0x58534341
 
@@ -37,6 +37,10 @@
 #define XSCALE_LDIC    0x07
 #define XSCALE_SELDCSR 0x09
 
+/* Possible CPU types */
+#define        XSCALE_IXP4XX_PXA2XX    0x0
+#define        XSCALE_PXA3XX           0x4
+
 enum xscale_debug_reason
 {
        XSCALE_DBG_REASON_GENERIC,
@@ -69,13 +73,13 @@ struct xscale_trace_data
 struct xscale_trace
 {
        trace_status_t capture_status;  /* current state of capture run */
-       struct image_s *image;                                  /* source for target opcodes */
+       struct image *image;                                    /* source for target opcodes */
        struct xscale_trace_data *data;         /* linked list of collected trace data */
        int buffer_enabled;                             /* whether trace buffer is enabled */
        int buffer_fill;                                /* maximum number of trace runs to read (-1 for wrap-around) */
        int pc_ok;
        uint32_t current_pc;
-       armv4_5_state_t core_state;             /* current core state (ARM, Thumb, Jazelle) */
+       enum arm_state core_state;      /* current core state (ARM, Thumb) */
 };
 
 struct xscale_common
@@ -129,10 +133,13 @@ struct xscale_common
        uint32_t cp15_control_reg;
 
        int fast_memory_access;
+
+       /* CPU variant */
+       int xscale_variant;
 };
 
 static inline struct xscale_common *
-target_to_xscale(struct target_s *target)
+target_to_xscale(struct target *target)
 {
        return container_of(target->arch_info, struct xscale_common,
                        armv4_5_common);
@@ -141,7 +148,7 @@ target_to_xscale(struct target_s *target)
 struct xscale_reg
 {
        int dbg_handler_number;
-       target_t *target;
+       struct target *target;
 };
 
 enum