X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ftarget%2Fetm.h;h=b74c6d9049451665ad472123276de921a46a48d3;hb=144e3678bd2d518388b6c2d7f3d2a912a9ac2abd;hp=3de54eef2a2f9abec1c9065e9ea7833acbf7c62d;hpb=d0c19e0a9d51211953a363026c662d290542fe85;p=openocd

diff --git a/src/target/etm.h b/src/target/etm.h
index 3de54eef..b74c6d90 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -26,7 +26,7 @@
 #include "trace.h"
 #include "arm_jtag.h"
 
-struct image_s;
+struct image;
 
 /* ETM registers (JTAG protocol) */
 enum
@@ -126,7 +126,7 @@ struct etm_context;
 struct etm_capture_driver
 {
 	char *name;
-	int (*register_commands)(struct command_context_s *cmd_ctx);
+	int (*register_commands)(struct command_context *cmd_ctx);
 	int (*init)(struct etm_context *etm_ctx);
 	trace_status_t (*status)(struct etm_context *etm_ctx);
 	int (*read_trace)(struct etm_context *etm_ctx);
@@ -154,7 +154,7 @@ struct etmv1_trace_data
  */
 struct etm_context
 {
-	target_t *target;		/* target this ETM is connected to */
+	struct target *target;		/* target this ETM is connected to */
 	struct reg_cache *reg_cache;		/* ETM register cache */
 	struct etm_capture_driver *capture_driver;	/* driver used to access ETM data */
 	void *capture_driver_priv;	/* capture driver private data */
@@ -165,7 +165,7 @@ struct etm_context
 	etm_portmode_t portmode;	/* normal, multiplexed or demultiplexed */
 	etmv1_tracemode_t tracemode;	/* type of info trace contains */
 	int /*armv4_5_state_t*/ core_state;	/* current core state */
-	struct image_s *image;		/* source for target opcodes */
+	struct image *image;		/* source for target opcodes */
 	uint32_t pipe_index;		/* current trace cycle */
 	uint32_t data_index;		/* cycle holding next data packet */
 	bool data_half;			/* port half on a 16 bit port */
@@ -207,12 +207,12 @@ typedef enum
 	BR_RSVD7   = 0x7, /* reserved */
 } etmv1_branch_reason_t;
 
-struct reg_cache* etm_build_reg_cache(target_t *target,
+struct reg_cache* etm_build_reg_cache(struct target *target,
 		struct arm_jtag *jtag_info, struct etm_context *etm_ctx);
 
-int etm_setup(target_t *target);
+int etm_setup(struct target *target);
 
-int etm_register_commands(struct command_context_s *cmd_ctx);
+int etm_register_commands(struct command_context *cmd_ctx);
 
 #define ERROR_ETM_INVALID_DRIVER	(-1300)
 #define ERROR_ETM_PORTMODE_NOT_SUPPORTED	(-1301)