X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fxscale.h;h=e480da9307ffc0594195d90fcae3316388f52e2b;hb=8f76ca05d998ad8bcebb3d634a09386ea8c54e5e;hp=82f4e379a63e485e06bbca2c82d3782774505f8c;hpb=ee139164114460d5c4c1a720e28740a7dceca712;p=openocd.git

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 82f4e379a6..e480da9307 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -71,13 +71,20 @@ struct xscale_trace_data
 	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 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) */
 };
 
@@ -176,6 +183,6 @@ enum
 	XSCALE_TXRXCTRL,
 };
 
-#define ERROR_XSCALE_NO_TRACE_DATA	(-1500)
+#define ERROR_XSCALE_NO_TRACE_DATA	(-700)
 
 #endif /* XSCALE_H */