X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.h;h=73d63191466e4a9e3ac55f6484f58594ce1bceaf;hp=691a00015a158707bc431f016128495030c0954f;hb=151347585a48ef746d8ffbfed7ba9bd621737b0c;hpb=6c965a3da9cd6f5b2cf1b177d38723356c83d923

diff --git a/src/target/target.h b/src/target/target.h
index 691a00015a..73d6319146 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -114,15 +114,15 @@ extern const Jim_Nvp nvp_target_endian[];
 
 struct target_s;
 
-typedef struct working_area_s
+struct working_area
 {
 	uint32_t address;
 	uint32_t size;
 	int free;
 	uint8_t *backup;
-	struct working_area_s **user;
-	struct working_area_s *next;
-} working_area_t;
+	struct working_area **user;
+	struct working_area *next;
+};
 
 // target_type.h contains the full definitionof struct target_type_s
 struct target_type_s;
@@ -149,16 +149,16 @@ typedef struct target_s
 	uint32_t working_area_phys;			/* physical address */
 	uint32_t working_area_size;			/* size in bytes */
 	uint32_t backup_working_area;			/* whether the content of the working area has to be preserved */
-	struct working_area_s *working_areas;/* list of allocated working areas */
+	struct working_area *working_areas;/* list of allocated working areas */
 	enum target_debug_reason debug_reason;/* reason why the target entered debug state */
 	enum target_endianess endianness;	/* target endianess */
 	// also see: target_state_name()
 	enum target_state state;			/* the current backend-state (running, halted, ...) */
-	struct reg_cache_s *reg_cache;		/* the first register cache of the target (core regs) */
+	struct reg_cache *reg_cache;		/* the first register cache of the target (core regs) */
 	struct breakpoint_s *breakpoints;	/* list of breakpoints */
-	struct watchpoint_s *watchpoints;	/* list of watchpoints */
+	struct watchpoint *watchpoints;	/* list of watchpoints */
 	struct trace_s *trace_info;			/* generic trace information */
-	struct debug_msg_receiver_s *dbgmsg;/* list of debug message receivers */
+	struct debug_msg_receiver *dbgmsg;/* list of debug message receivers */
 	uint32_t dbg_msg_enabled;				/* debug message status */
 	void *arch_info;					/* architecture specific information */
 	struct target_s *next;				/* next target in list */
@@ -232,22 +232,22 @@ struct target_event_action_s {
 	target_event_action_t *next;
  };
 
-typedef struct target_event_callback_s
+struct target_event_callback
 {
 	int (*callback)(struct target_s *target, enum target_event event, void *priv);
 	void *priv;
-	struct target_event_callback_s *next;
-} target_event_callback_t;
+	struct target_event_callback *next;
+};
 
-typedef struct target_timer_callback_s
+struct target_timer_callback
 {
 	int (*callback)(void *priv);
 	int time_ms;
 	int periodic;
 	struct timeval when;
 	void *priv;
-	struct target_timer_callback_s *next;
-} target_timer_callback_t;
+	struct target_timer_callback *next;
+};
 
 int target_register_commands(struct command_context_s *cmd_ctx);
 int target_register_user_commands(struct command_context_s *cmd_ctx);
@@ -330,14 +330,14 @@ int target_remove_breakpoint(struct target_s *target,
  * This routine is a wrapper for target->type->add_watchpoint.
  */
 int target_add_watchpoint(struct target_s *target,
-		struct watchpoint_s *watchpoint);
+		struct watchpoint *watchpoint);
 /**
  * Remove the @a watchpoint for @a target.
  *
  * This routine is a wrapper for target->type->remove_watchpoint.
  */
 int target_remove_watchpoint(struct target_s *target,
-		struct watchpoint_s *watchpoint);
+		struct watchpoint *watchpoint);
 
 /**
  * Obtain the registers for GDB.
@@ -361,7 +361,7 @@ int target_step(struct target_s *target,
  */
 int target_run_algorithm(struct target_s *target,
 		int num_mem_params, struct mem_param *mem_params,
-		int num_reg_params, reg_param_t *reg_param,
+		int num_reg_params, struct reg_param *reg_param,
 		uint32_t entry_point, uint32_t exit_point,
 		int timeout_ms, void *arch_info);
 
@@ -441,17 +441,17 @@ const char *target_state_name( target_t *target );
  *
  */
 int target_alloc_working_area(struct target_s *target,
-		uint32_t size, working_area_t **area);
-int target_free_working_area(struct target_s *target, working_area_t *area);
+		uint32_t size, struct working_area **area);
+int target_free_working_area(struct target_s *target, struct working_area *area);
 int target_free_working_area_restore(struct target_s *target,
-		working_area_t *area, int restore);
+		struct working_area *area, int restore);
 void target_free_all_working_areas(struct target_s *target);
 void target_free_all_working_areas_restore(struct target_s *target, int restore);
 
 extern target_t *all_targets;
 
-extern target_event_callback_t *target_event_callbacks;
-extern target_timer_callback_t *target_timer_callbacks;
+extern struct target_event_callback *target_event_callbacks;
+extern struct target_timer_callback *target_timer_callbacks;
 
 uint32_t target_buffer_get_u32(target_t *target, const uint8_t *buffer);
 uint16_t target_buffer_get_u16(target_t *target, const uint8_t *buffer);