X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fxscale.h;h=4f1b54d8b92403cd15e68aa907af24f03d0ba771;hb=9e9633c6b98cc9243ae78cd12ab657d041eaa73e;hp=a47bce72a85ccd048ed57c474ef33cb1f2c8fc46;hpb=ea34dc988f63ffa1a9ba9e592a65f2f46e78f82a;p=openocd.git

diff --git a/src/target/xscale.h b/src/target/xscale.h
index a47bce72a8..4f1b54d8b9 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -50,15 +50,15 @@ enum xscale_trace_entry_type
 	XSCALE_TRACE_ADDRESS = 0x1,
 };
 
-typedef struct xscale_trace_entry_s
+struct xscale_trace_entry
 {
 	uint8_t data;
 	enum xscale_trace_entry_type type;
-} xscale_trace_entry_t;
+};
 
 struct xscale_trace_data
 {
-	xscale_trace_entry_t *entries;
+	struct xscale_trace_entry *entries;
 	int depth;
 	uint32_t chkpt0;
 	uint32_t chkpt1;
@@ -66,22 +66,22 @@ struct xscale_trace_data
 	struct xscale_trace_data *next;
 };
 
-typedef struct xscale_trace_s
+struct xscale_trace
 {
 	trace_status_t capture_status;	/* current state of capture run */
-	struct image_s *image;					/* source for target opcodes */
+	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) */
-} xscale_trace_t;
+};
 
-typedef struct xscale_common_s
+struct xscale_common
 {
 	/* armv4/5 common stuff */
-	armv4_5_common_t armv4_5_common;
+	struct arm armv4_5_common;
 
 	int common_magic;
 
@@ -120,7 +120,7 @@ typedef struct xscale_common_s
 
 	uint8_t vector_catch;
 
-	xscale_trace_t trace;
+	struct xscale_trace trace;
 
 	int arch_debug_reason;
 
@@ -129,20 +129,20 @@ typedef struct xscale_common_s
 	uint32_t cp15_control_reg;
 
 	int fast_memory_access;
-} xscale_common_t;
+};
 
-static inline struct xscale_common_s *
-target_to_xscale(struct target_s *target)
+static inline struct xscale_common *
+target_to_xscale(struct target *target)
 {
-	return container_of(target->arch_info, struct xscale_common_s,
+	return container_of(target->arch_info, struct xscale_common,
 			armv4_5_common);
 }
 
-typedef struct xscale_reg_s
+struct xscale_reg
 {
 	int dbg_handler_number;
-	target_t *target;
-} xscale_reg_t;
+	struct target *target;
+};
 
 enum
 {