X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm.h;h=08f9c2269bda35084a745b803c4bdfabd344be53;hp=ead45855e95805001943757d6c12314e95971644;hb=99614219ad111c124ea5d5f997bb388cbcf00e32;hpb=d47764ff7176b6e3d97b49e82d4db7fe17c8e552

diff --git a/src/target/etm.h b/src/target/etm.h
index ead45855e9..08f9c2269b 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -71,12 +71,12 @@ enum
 	ETM_ID = 0x79,
 };
 
-typedef struct etm_reg_s
+struct etm_reg
 {
 	uint32_t value;
 	const struct etm_reg_info *reg_info;
-	arm_jtag_t *jtag_info;
-} etm_reg_t;
+	struct arm_jtag *jtag_info;
+};
 
 typedef enum
 {
@@ -123,7 +123,7 @@ typedef enum
 /* forward-declare ETM context */
 struct etm;
 
-typedef struct etm_capture_driver_s
+struct etm_capture_driver
 {
 	char *name;
 	int (*register_commands)(struct command_context_s *cmd_ctx);
@@ -132,7 +132,7 @@ typedef struct etm_capture_driver_s
 	int (*read_trace)(struct etm *etm_ctx);
 	int (*start_capture)(struct etm *etm_ctx);
 	int (*stop_capture)(struct etm *etm_ctx);
-} etm_capture_driver_t;
+};
 
 enum
 {
@@ -140,12 +140,12 @@ enum
 	ETMV1_TRIGGER_CYCLE = 0x2,
 };
 
-typedef struct etmv1_trace_data_s
+struct etmv1_trace_data
 {
 	uint8_t pipestat;	/* bits 0-2 pipeline status */
 	uint16_t packet;		/* packet data (4, 8 or 16 bit) */
 	int flags;		/* ETMV1_TRACESYNC_CYCLE, ETMV1_TRIGGER_CYCLE */
-} etmv1_trace_data_t;
+};
 
 /* describe a trace context
  * if support for ETMv2 or ETMv3 is to be implemented,
@@ -156,11 +156,11 @@ typedef struct etm
 {
 	target_t *target;		/* target this ETM is connected to */
 	reg_cache_t *reg_cache;		/* ETM register cache */
-	etm_capture_driver_t *capture_driver;	/* driver used to access ETM data */
+	struct etm_capture_driver *capture_driver;	/* driver used to access ETM data */
 	void *capture_driver_priv;	/* capture driver private data */
 	uint32_t trigger_percent;	/* how much trace buffer to fill after trigger */
 	trace_status_t capture_status;	/* current state of capture run */
-	etmv1_trace_data_t *trace_data;	/* trace data */
+	struct etmv1_trace_data *trace_data;	/* trace data */
 	uint32_t trace_depth;		/* number of cycles to be analyzed, 0 if no data available */
 	etm_portmode_t portmode;	/* normal, multiplexed or demultiplexed */
 	etmv1_tracemode_t tracemode;	/* type of info trace contains */
@@ -208,7 +208,7 @@ typedef enum
 } etmv1_branch_reason_t;
 
 reg_cache_t* etm_build_reg_cache(target_t *target,
-		arm_jtag_t *jtag_info, etm_context_t *etm_ctx);
+		struct arm_jtag *jtag_info, etm_context_t *etm_ctx);
 
 int etm_setup(target_t *target);