ADI_V5_JTAG: review scope of data

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

diff --git a/src/target/xscale.h b/src/target/xscale.h
index c083b06cd7ac6a408e1e8632da261d3b5b548c1a..f20074fdb9ec1ea77772db34350e23872d3617bf 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,8 +23,8 @@
 #ifndef XSCALE_H
 #define XSCALE_H
 
-#include <target/armv4_5.h>
-#include <target/armv4_5_mmu.h>
+#include "arm.h"
+#include "armv4_5_mmu.h"
 #include "trace.h"
 
 #define        XSCALE_COMMON_MAGIC 0x58534341
@@ -79,7 +79,7 @@ struct xscale_trace
        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