X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetm.h;h=b74c6d9049451665ad472123276de921a46a48d3;hb=2d6829d6982fa485b8cabb3a91e41b9c50c7f3d1;hp=63e31f1b64dab1dffdcf874d3e97c32774293c7b;hpb=74d09617b927ed7011098d5a65087dee1ef1e87a;p=openocd.git

diff --git a/src/target/etm.h b/src/target/etm.h
index 63e31f1b64..b74c6d9049 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
@@ -121,17 +121,17 @@ typedef enum
 } etmv1_tracemode_t;
 
 /* forward-declare ETM context */
-struct etm;
+struct etm_context;
 
 struct etm_capture_driver
 {
 	char *name;
-	int (*register_commands)(struct command_context_s *cmd_ctx);
-	int (*init)(struct etm *etm_ctx);
-	trace_status_t (*status)(struct etm *etm_ctx);
-	int (*read_trace)(struct etm *etm_ctx);
-	int (*start_capture)(struct etm *etm_ctx);
-	int (*stop_capture)(struct etm *etm_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);
+	int (*start_capture)(struct etm_context *etm_ctx);
+	int (*stop_capture)(struct etm_context *etm_ctx);
 };
 
 enum
@@ -152,9 +152,9 @@ struct etmv1_trace_data
  * this will have to be split into version independent elements
  * and a version specific part
  */
-typedef struct etm
+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 @@ typedef struct etm
 	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 */
@@ -179,7 +179,7 @@ typedef struct etm
 	uint32_t last_branch_reason;	/* type of last branch encountered */
 	uint32_t last_ptr;		/* address of the last data access */
 	uint32_t last_instruction;	/* index of last executed (to calc timings) */
-} etm_context_t;
+};
 
 /* PIPESTAT values */
 typedef enum
@@ -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 arm_jtag *jtag_info, etm_context_t *etm_ctx);
+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)