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

diff --git a/src/target/xscale.h b/src/target/xscale.h
index 82f4e379a6..c5cd7b7746 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -18,8 +18,9 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef XSCALE_H
 #define XSCALE_H
 
@@ -41,27 +42,23 @@
 #define	XSCALE_IXP4XX_PXA2XX	0x0
 #define	XSCALE_PXA3XX		0x4
 
-enum xscale_debug_reason
-{
+enum xscale_debug_reason {
 	XSCALE_DBG_REASON_GENERIC,
 	XSCALE_DBG_REASON_RESET,
 	XSCALE_DBG_REASON_TB_FULL,
 };
 
-enum xscale_trace_entry_type
-{
+enum xscale_trace_entry_type {
 	XSCALE_TRACE_MESSAGE = 0x0,
 	XSCALE_TRACE_ADDRESS = 0x1,
 };
 
-struct xscale_trace_entry
-{
+struct xscale_trace_entry {
 	uint8_t data;
 	enum xscale_trace_entry_type type;
 };
 
-struct xscale_trace_data
-{
+struct xscale_trace_data {
 	struct xscale_trace_entry *entries;
 	int depth;
 	uint32_t chkpt0;
@@ -71,20 +68,24 @@ struct xscale_trace_data
 	struct xscale_trace_data *next;
 };
 
-struct xscale_trace
-{
-	trace_status_t capture_status;	/* current state of capture run */
+enum trace_mode {
+	XSCALE_TRACE_DISABLED,
+	XSCALE_TRACE_FILL,
+	XSCALE_TRACE_WRAP
+};
+
+struct xscale_trace {
 	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) */
 };
 
-struct xscale_common
-{
+struct xscale_common {
 	/* armv4/5 common stuff */
-	struct arm armv4_5_common;
+	struct arm arm;
 
 	int common_magic;
 
@@ -140,18 +141,15 @@ struct xscale_common
 static inline struct xscale_common *
 target_to_xscale(struct target *target)
 {
-	return container_of(target->arch_info, struct xscale_common,
-			armv4_5_common);
+	return container_of(target->arch_info, struct xscale_common, arm);
 }
 
-struct xscale_reg
-{
+struct xscale_reg {
 	int dbg_handler_number;
 	struct target *target;
 };
 
-enum
-{
+enum {
 	XSCALE_MAINID,		/* 0 */
 	XSCALE_CACHETYPE,
 	XSCALE_CTRL,
@@ -176,6 +174,6 @@ enum
 	XSCALE_TXRXCTRL,
 };
 
-#define ERROR_XSCALE_NO_TRACE_DATA	(-1500)
+#define ERROR_XSCALE_NO_TRACE_DATA	(-700)
 
 #endif /* XSCALE_H */