From 72b421418f315cb54a01ba4d249082f989d5154a Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 08:42:06 -0800
Subject: [PATCH] watchpoint_t -> struct watchpoint

Remove misleading typedef and redundant suffix from struct watchpoint.
---
 src/target/arm11.c         |  4 ++--
 src/target/arm7_9_common.c | 10 +++++-----
 src/target/arm7_9_common.h |  4 ++--
 src/target/breakpoints.c   | 18 +++++++++---------
 src/target/breakpoints.h   |  6 +++---
 src/target/cortex_m3.c     | 10 +++++-----
 src/target/mips_m4k.c      | 10 +++++-----
 src/target/mips_m4k.h      |  8 ++++----
 src/target/target.c        |  6 +++---
 src/target/target.h        |  6 +++---
 src/target/target_type.h   |  4 ++--
 src/target/xscale.c        | 12 ++++++------
 12 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/target/arm11.c b/src/target/arm11.c
index e5794b8ae5..5e96b3e6a5 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1596,7 +1596,7 @@ static int arm11_remove_breakpoint(struct target_s *target,
 }
 
 static int arm11_add_watchpoint(struct target_s *target,
-		watchpoint_t *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	FNC_INFO_NOTIMPLEMENTED;
 
@@ -1604,7 +1604,7 @@ static int arm11_add_watchpoint(struct target_s *target,
 }
 
 static int arm11_remove_watchpoint(struct target_s *target,
-		watchpoint_t *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	FNC_INFO_NOTIMPLEMENTED;
 
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 1cd3456b7d..893c39dbd4 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -520,7 +520,7 @@ int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
  * @return Error status if watchpoint set fails or the result of executing the
  *         JTAG queue
  */
-int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int arm7_9_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	int retval = ERROR_OK;
 	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
@@ -591,7 +591,7 @@ int arm7_9_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
  * @return Error status while trying to unset the watchpoint or the result of
  *         executing the JTAG queue
  */
-int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int arm7_9_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	int retval = ERROR_OK;
 	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
@@ -639,7 +639,7 @@ int arm7_9_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
  * @param watchpoint Pointer to the watchpoint to be added
  * @return Error status while trying to add the watchpoint
  */
-int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int arm7_9_add_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
 
@@ -672,7 +672,7 @@ int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
  * @param watchpoint Pointer to the watchpoint to be removed
  * @return Result of trying to unset the watchpoint
  */
-int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int arm7_9_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	int retval = ERROR_OK;
 	struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
@@ -1770,7 +1770,7 @@ int arm7_9_restart_core(struct target_s *target)
  */
 void arm7_9_enable_watchpoints(struct target_s *target)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
 
 	while (watchpoint)
 	{
diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index ca73997e14..0cd6bf5dac 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -145,8 +145,8 @@ int arm7_9_run_algorithm(struct target_s *target, int num_mem_params, struct mem
 
 int arm7_9_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
 int arm7_9_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-int arm7_9_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
-int arm7_9_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
+int arm7_9_add_watchpoint(struct target_s *target, struct watchpoint *watchpoint);
+int arm7_9_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint);
 
 void arm7_9_enable_eice_step(target_t *target, uint32_t next_pc);
 void arm7_9_disable_eice_step(target_t *target);
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index dd672b9fef..08008c226d 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -181,8 +181,8 @@ breakpoint_t* breakpoint_find(target_t *target, uint32_t address)
 int watchpoint_add(target_t *target, uint32_t address, uint32_t length,
 		enum watchpoint_rw rw, uint32_t value, uint32_t mask)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
-	watchpoint_t **watchpoint_p = &target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
+	struct watchpoint **watchpoint_p = &target->watchpoints;
 	int retval;
 	char *reason;
 
@@ -206,7 +206,7 @@ int watchpoint_add(target_t *target, uint32_t address, uint32_t length,
 		watchpoint = watchpoint->next;
 	}
 
-	(*watchpoint_p) = calloc(1, sizeof(watchpoint_t));
+	(*watchpoint_p) = calloc(1, sizeof(struct watchpoint));
 	(*watchpoint_p)->address = address;
 	(*watchpoint_p)->length = length;
 	(*watchpoint_p)->value = value;
@@ -244,10 +244,10 @@ bye:
 	return ERROR_OK;
 }
 
-static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
+static void watchpoint_free(target_t *target, struct watchpoint *watchpoint_remove)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
-	watchpoint_t **watchpoint_p = &target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
+	struct watchpoint **watchpoint_p = &target->watchpoints;
 
 	while (watchpoint)
 	{
@@ -267,8 +267,8 @@ static void watchpoint_free(target_t *target, watchpoint_t *watchpoint_remove)
 
 void watchpoint_remove(target_t *target, uint32_t address)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
-	watchpoint_t **watchpoint_p = &target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
+	struct watchpoint **watchpoint_p = &target->watchpoints;
 
 	while (watchpoint)
 	{
@@ -290,7 +290,7 @@ void watchpoint_remove(target_t *target, uint32_t address)
 
 void watchpoint_clear_target(target_t *target)
 {
-	watchpoint_t *watchpoint;
+	struct watchpoint *watchpoint;
 	LOG_DEBUG("Delete all watchpoints for target: %s", target_get_name( target ));
 	while ((watchpoint = target->watchpoints) != NULL)
 	{
diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h
index 781c91b6b8..57c06c73e7 100644
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -46,7 +46,7 @@ typedef struct breakpoint_s
 	int unique_id;
 } breakpoint_t;
 
-typedef struct watchpoint_s
+struct watchpoint
 {
 	uint32_t address;
 	uint32_t length;
@@ -54,9 +54,9 @@ typedef struct watchpoint_s
 	uint32_t value;
 	enum watchpoint_rw rw;
 	int set;
-	struct watchpoint_s *next;
+	struct watchpoint *next;
 	int unique_id;
-} watchpoint_t;
+};
 
 void breakpoint_clear_target(struct target_s *target);
 int breakpoint_add(struct target_s *target,
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index caeeac7a35..6f64714541 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1032,7 +1032,7 @@ cortex_m3_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 }
 
 static int
-cortex_m3_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+cortex_m3_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	int dwt_num = 0;
 	uint32_t mask, temp;
@@ -1097,7 +1097,7 @@ cortex_m3_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 }
 
 static int
-cortex_m3_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+cortex_m3_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	struct cortex_m3_common_s *cortex_m3 = target_to_cm3(target);
 	cortex_m3_dwt_comparator_t *comparator;
@@ -1134,7 +1134,7 @@ cortex_m3_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 }
 
 static int
-cortex_m3_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+cortex_m3_add_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	struct cortex_m3_common_s *cortex_m3 = target_to_cm3(target);
 
@@ -1192,7 +1192,7 @@ cortex_m3_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 }
 
 static int
-cortex_m3_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+cortex_m3_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	struct cortex_m3_common_s *cortex_m3 = target_to_cm3(target);
 
@@ -1216,7 +1216,7 @@ cortex_m3_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 
 static void cortex_m3_enable_watchpoints(struct target_s *target)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
 
 	/* set any pending watchpoints */
 	while (watchpoint)
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 909745aa64..0fc32ab879 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -699,7 +699,7 @@ int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint
 	return ERROR_OK;
 }
 
-int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	mips32_common_t *mips32 = target->arch_info;
 	mips32_comparator_t * comparator_list = mips32->data_break_list;
@@ -767,7 +767,7 @@ int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	return ERROR_OK;
 }
 
-int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	/* get pointers to arch-specific information */
 	mips32_common_t *mips32 = target->arch_info;
@@ -793,7 +793,7 @@ int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	return ERROR_OK;
 }
 
-int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_add_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	mips32_common_t *mips32 = target->arch_info;
 
@@ -809,7 +809,7 @@ int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	return ERROR_OK;
 }
 
-int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	/* get pointers to arch-specific information */
 	mips32_common_t *mips32 = target->arch_info;
@@ -832,7 +832,7 @@ int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint
 
 void mips_m4k_enable_watchpoints(struct target_s *target)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
 
 	/* set any pending watchpoints */
 	while (watchpoint)
diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index e11f06a128..3eddc3f77c 100644
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -45,9 +45,9 @@ int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *bp);
 int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *bp);
 
 void mips_m4k_enable_watchpoints(struct target_s *target);
-int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *wp);
-int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *wp);
-int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *wp);
-int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *wp);
+int mips_m4k_set_watchpoint(struct target_s *target, struct watchpoint *wp);
+int mips_m4k_unset_watchpoint(struct target_s *target, struct watchpoint *wp);
+int mips_m4k_add_watchpoint(struct target_s *target, struct watchpoint *wp);
+int mips_m4k_remove_watchpoint(struct target_s *target, struct watchpoint *wp);
 
 #endif	/*MIPS_M4K_H*/
diff --git a/src/target/target.c b/src/target/target.c
index f56fbc44e6..e8f91def47 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -611,12 +611,12 @@ int target_remove_breakpoint(struct target_s *target,
 }
 
 int target_add_watchpoint(struct target_s *target,
-		struct watchpoint_s *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	return target->type->add_watchpoint(target, watchpoint);
 }
 int target_remove_watchpoint(struct target_s *target,
-		struct watchpoint_s *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	return target->type->remove_watchpoint(target, watchpoint);
 }
@@ -2797,7 +2797,7 @@ COMMAND_HANDLER(handle_wp_command)
 
 	if (argc == 0)
 	{
-		watchpoint_t *watchpoint = target->watchpoints;
+		struct watchpoint *watchpoint = target->watchpoints;
 
 		while (watchpoint)
 		{
diff --git a/src/target/target.h b/src/target/target.h
index 1e5639d6b7..064a954a42 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -156,7 +156,7 @@ typedef struct target_s
 	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 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 */
 	uint32_t dbg_msg_enabled;				/* debug message status */
@@ -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.
diff --git a/src/target/target_type.h b/src/target/target_type.h
index ee76ff4ca1..21d7295d04 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -137,11 +137,11 @@ struct target_type_s
 	 * However, this method can be invoked on unresponsive targets.
 	 */
 	int (*remove_breakpoint)(struct target_s *target, breakpoint_t *breakpoint);
-	int (*add_watchpoint)(struct target_s *target, watchpoint_t *watchpoint);
+	int (*add_watchpoint)(struct target_s *target, struct watchpoint *watchpoint);
 	/* remove watchpoint. hw will only be updated if the target is currently halted.
 	 * However, this method can be invoked on unresponsive targets.
 	 */
-	int (*remove_watchpoint)(struct target_s *target, watchpoint_t *watchpoint);
+	int (*remove_watchpoint)(struct target_s *target, struct watchpoint *watchpoint);
 
 	/* target algorithm support */
 	int (*run_algorithm_imp)(struct target_s *target, int num_mem_params, struct mem_param *mem_params, int num_reg_params, struct reg_param *reg_param, uint32_t entry_point, uint32_t exit_point, int timeout_ms, void *arch_info);
diff --git a/src/target/xscale.c b/src/target/xscale.c
index 3540f6a607..a04bf42954 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -64,7 +64,7 @@ static int xscale_restore_context(target_t *);
 static int xscale_get_reg(reg_t *reg);
 static int xscale_set_reg(reg_t *reg, uint8_t *buf);
 static int xscale_set_breakpoint(struct target_s *, breakpoint_t *);
-static int xscale_set_watchpoint(struct target_s *, watchpoint_t *);
+static int xscale_set_watchpoint(struct target_s *, struct watchpoint *);
 static int xscale_unset_breakpoint(struct target_s *, breakpoint_t *);
 static int xscale_read_trace(target_t *);
 
@@ -1163,7 +1163,7 @@ static int xscale_disable_single_step(struct target_s *target)
 
 static void xscale_enable_watchpoints(struct target_s *target)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
 
 	while (watchpoint)
 	{
@@ -2226,7 +2226,7 @@ static int xscale_remove_breakpoint(struct target_s *target, breakpoint_t *break
 }
 
 static int xscale_set_watchpoint(struct target_s *target,
-		watchpoint_t *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	struct xscale_common_s *xscale = target_to_xscale(target);
 	uint8_t enable = 0;
@@ -2282,7 +2282,7 @@ static int xscale_set_watchpoint(struct target_s *target,
 }
 
 static int xscale_add_watchpoint(struct target_s *target,
-		watchpoint_t *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	struct xscale_common_s *xscale = target_to_xscale(target);
 
@@ -2308,7 +2308,7 @@ static int xscale_add_watchpoint(struct target_s *target,
 }
 
 static int xscale_unset_watchpoint(struct target_s *target,
-		watchpoint_t *watchpoint)
+		struct watchpoint *watchpoint)
 {
 	struct xscale_common_s *xscale = target_to_xscale(target);
 	reg_t *dbcon = &xscale->reg_cache->reg_list[XSCALE_DBCON];
@@ -2343,7 +2343,7 @@ static int xscale_unset_watchpoint(struct target_s *target,
 	return ERROR_OK;
 }
 
-static int xscale_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+static int xscale_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	struct xscale_common_s *xscale = target_to_xscale(target);
 
-- 
2.30.2