From e2001ba2116fe5c0c75f7953b5fbe35da65fa29d Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 08:42:39 -0800
Subject: [PATCH] etm_capture_driver_t -> struct etm_capture_driver

Remove misleading typedef and redundant suffix from struct etm_capture_driver.
---
 src/target/etb.c        | 2 +-
 src/target/etb.h        | 2 +-
 src/target/etm.c        | 6 +++---
 src/target/etm.h        | 6 +++---
 src/target/etm_dummy.c  | 2 +-
 src/target/etm_dummy.h  | 2 +-
 src/target/oocd_trace.c | 2 +-
 src/target/oocd_trace.h | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/target/etb.c b/src/target/etb.c
index 6a711d42d..d6bf73f46 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -682,7 +682,7 @@ static int etb_stop_capture(etm_context_t *etm_ctx)
 	return ERROR_OK;
 }
 
-etm_capture_driver_t etb_capture_driver =
+struct etm_capture_driver etb_capture_driver =
 {
 	.name = "etb",
 	.register_commands = etb_register_commands,
diff --git a/src/target/etb.h b/src/target/etb.h
index 15171f570..b8973de22 100644
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -52,7 +52,7 @@ struct etb_reg
 	etb_t *etb;
 };
 
-extern etm_capture_driver_t etb_capture_driver;
+extern struct etm_capture_driver etb_capture_driver;
 
 reg_cache_t* etb_build_reg_cache(etb_t *etb);
 
diff --git a/src/target/etm.c b/src/target/etm.c
index ed2c76cfc..f423835f7 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -621,12 +621,12 @@ static int etm_write_reg(reg_t *reg, uint32_t value)
 /* ETM trace analysis functionality
  *
  */
-extern etm_capture_driver_t etm_dummy_capture_driver;
+extern struct etm_capture_driver etm_dummy_capture_driver;
 #if BUILD_OOCD_TRACE == 1
-extern etm_capture_driver_t oocd_trace_capture_driver;
+extern struct etm_capture_driver oocd_trace_capture_driver;
 #endif
 
-static etm_capture_driver_t *etm_capture_drivers[] =
+static struct etm_capture_driver *etm_capture_drivers[] =
 {
 	&etb_capture_driver,
 	&etm_dummy_capture_driver,
diff --git a/src/target/etm.h b/src/target/etm.h
index a58adb30a..317474ce0 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -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
 {
@@ -156,7 +156,7 @@ 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 */
diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 6bb2cde4f..4d975c6a5 100644
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -94,7 +94,7 @@ static int etm_dummy_stop_capture(etm_context_t *etm_ctx)
 	return ERROR_OK;
 }
 
-etm_capture_driver_t etm_dummy_capture_driver =
+struct etm_capture_driver etm_dummy_capture_driver =
 {
 	.name = "dummy",
 	.register_commands = etm_dummy_register_commands,
diff --git a/src/target/etm_dummy.h b/src/target/etm_dummy.h
index 0e712e34e..2673e4f56 100644
--- a/src/target/etm_dummy.h
+++ b/src/target/etm_dummy.h
@@ -22,6 +22,6 @@
 
 #include "etm.h"
 
-extern etm_capture_driver_t etm_dummy_capture_driver;
+extern struct etm_capture_driver etm_dummy_capture_driver;
 
 #endif /* ETB_H */
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index 755e1b69d..f4064f787 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -278,7 +278,7 @@ static int oocd_trace_stop_capture(etm_context_t *etm_ctx)
 	return ERROR_OK;
 }
 
-etm_capture_driver_t oocd_trace_capture_driver =
+struct etm_capture_driver oocd_trace_capture_driver =
 {
 	.name = "oocd_trace",
 	.register_commands = oocd_trace_register_commands,
diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index 6c3f7f922..886ff79a6 100644
--- a/src/target/oocd_trace.h
+++ b/src/target/oocd_trace.h
@@ -54,6 +54,6 @@ typedef struct oocd_trace_s
 	struct termios oldtio, newtio;
 } oocd_trace_t;
 
-extern etm_capture_driver_t oocd_trace_capture_driver;
+extern struct etm_capture_driver oocd_trace_capture_driver;
 
 #endif /* OOCD_TRACE_TRACE_H */