cleanup: rename armv4_5 to arm for readability

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

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 9e19f45a9dac142d4ad34896775d66be671f2c28..49d4c71eccf445defdb126e89ab635461ee0066a 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"
 
@@ -67,25 +67,31 @@ struct xscale_trace_data
        uint32_t chkpt0;
        uint32_t chkpt1;
        uint32_t last_instruction;
+       unsigned int num_checkpoints;
        struct xscale_trace_data *next;
 };
 
+enum trace_mode
+{
+   XSCALE_TRACE_DISABLED,
+   XSCALE_TRACE_FILL,
+   XSCALE_TRACE_WRAP
+};
+
 struct xscale_trace
 {
-       trace_status_t capture_status;  /* current state of capture run */
        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) */
+       int buffer_fill;                                /* maximum number of trace runs to read */
+    int fill_counter;                          /* running count during trace collection */
+    enum trace_mode mode;
+       enum arm_state core_state;      /* current core state (ARM, Thumb) */
 };
 
 struct xscale_common
 {
        /* armv4/5 common stuff */
-       struct arm armv4_5_common;
+       struct arm arm;
 
        int common_magic;
 
@@ -142,7 +148,7 @@ static inline struct xscale_common *
 target_to_xscale(struct target *target)
 {
        return container_of(target->arch_info, struct xscale_common,
-                       armv4_5_common);
+                       arm);
 }
 
 struct xscale_reg
@@ -177,6 +183,6 @@ enum
        XSCALE_TXRXCTRL,
 };
 
-#define ERROR_XSCALE_NO_TRACE_DATA     (-1500)
+#define ERROR_XSCALE_NO_TRACE_DATA     (-700)
 
 #endif /* XSCALE_H */