X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fxscale.h;h=fd4bddf21375207e7e3e2c80057df958295a2c84;hb=f876d5e9c769a288faa7fd14b7bf373363542aab;hp=c9a6ea203cb1b24caf6897a9ecc1589743a7a53d;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f;p=fw%2Fopenocd

diff --git a/src/target/xscale.h b/src/target/xscale.h
index c9a6ea203..fd4bddf21 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,19 +23,16 @@
 #ifndef XSCALE_H
 #define XSCALE_H
 
-#include "target.h"
-#include "register.h"
 #include "armv4_5.h"
 #include "armv4_5_mmu.h"
 #include "trace.h"
-#include "image.h"
 
 #define	XSCALE_COMMON_MAGIC 0x58534341
 
 typedef struct xscale_jtag_s
 {
 	/* position in JTAG scan chain */
-	int chain_pos;
+	jtag_tap_t *tap;
 
 	/* IR length and instructions */	
 	int ir_length;
@@ -60,7 +57,7 @@ enum xscale_trace_entry_type
 
 typedef struct xscale_trace_entry_s
 {
-	u8 data;
+	uint8_t data;
 	enum xscale_trace_entry_type type;
 } xscale_trace_entry_t;
 
@@ -77,7 +74,7 @@ typedef struct xscale_trace_data_s
 typedef struct xscale_trace_s
 {
 	trace_status_t capture_status;	/* current state of capture run */
-	image_t *image;					/* source for target opcodes */
+	struct image_s *image;					/* source for target opcodes */
 	xscale_trace_data_t *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) */
@@ -108,8 +105,8 @@ typedef struct xscale_common_s
 	u32 high_vectors[8];
 	
 	/* static low vectors */
-	u8 static_low_vectors_set;	/* bit field with static vectors set by the user */
-	u8 static_high_vectors_set; /* bit field with static vectors set by the user */
+	uint8_t static_low_vectors_set;	/* bit field with static vectors set by the user */
+	uint8_t static_high_vectors_set; /* bit field with static vectors set by the user */
 	u32 static_low_vectors[8];
 	u32 static_high_vectors[8];
 
@@ -121,7 +118,6 @@ typedef struct xscale_common_s
 	int external_debug_break;
 	
 	/* breakpoint / watchpoint handling */
-	int force_hw_bkpts;
 	int dbr_available;
 	int dbr0_used;
 	int dbr1_used;
@@ -129,9 +125,9 @@ typedef struct xscale_common_s
 	int ibcr0_used;
 	int	ibcr1_used;
 	u32 arm_bkpt;
-	u16 thumb_bkpt;
+	uint16_t thumb_bkpt;
 	
-	u8 vector_catch;
+	uint8_t vector_catch;
 
 	xscale_trace_t trace;