ARMv7-M: make DAP commands verify target is an ARMv7-M

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

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 9e19f45a9dac142d4ad34896775d66be671f2c28..f20074fdb9ec1ea77772db34350e23872d3617bf 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,7 +23,7 @@
 #ifndef XSCALE_H
 #define XSCALE_H
 
-#include <target/armv4_5.h>
+#include "arm.h"
 #include "armv4_5_mmu.h"
 #include "trace.h"
 
@@ -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