etm_capture_driver_t -> struct etm_capture_driver

Remove misleading typedef and redundant suffix from struct etm_capture_driver.

diff --git a/src/target/etb.c b/src/target/etb.c
index 6a711d42d1cd52fb65a2c6be9d6db510ad3e03c1..d6bf73f46e02e497d6fe28ec4a42245172f4bccd 100644 (file)
--- 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;
 }
 
        return ERROR_OK;
 }
 

-etm_capture_driver_t etb_capture_driver =
+struct etm_capture_driver etb_capture_driver =

 {
        .name = "etb",
        .register_commands = etb_register_commands,
 {
        .name = "etb",
        .register_commands = etb_register_commands,

diff --git a/src/target/etb.h b/src/target/etb.h
index 15171f5700ce06a0d6f0852dd9cd14be36f7a29a..b8973de22d773b928b06d1e8d69259cd2ddd360d 100644 (file)
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -52,7 +52,7 @@ struct etb_reg
        etb_t *etb;
 };
 
        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);
 
 
 reg_cache_t* etb_build_reg_cache(etb_t *etb);
 

diff --git a/src/target/etm.c b/src/target/etm.c
index ed2c76cfc35a445a94dbdd887d09b694a383020a..f423835f7f2fdeaf5177284f6af47982c4ac4ef4 100644 (file)
--- 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
  *
  */
 /* 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
 #if BUILD_OOCD_TRACE == 1

-extern etm_capture_driver_t oocd_trace_capture_driver;
+extern struct etm_capture_driver oocd_trace_capture_driver;

 #endif
 
 #endif
 

-static etm_capture_driver_t *etm_capture_drivers[] =
+static struct etm_capture_driver *etm_capture_drivers[] =

 {
        &etb_capture_driver,
        &etm_dummy_capture_driver,
 {
        &etb_capture_driver,
        &etm_dummy_capture_driver,

diff --git a/src/target/etm.h b/src/target/etm.h
index a58adb30a230e65947cc17f3ab5de63961f474ff..317474ce079f9be254dd733fe5db448484ee3728 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -123,7 +123,7 @@ typedef enum
 /* forward-declare ETM context */
 struct etm;
 
 /* 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);
 {
        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);
        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
 {
 
 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 */
 {
        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 */
        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 6bb2cde4ff1d49b36db5f7af562d34b29f9ced59..4d975c6a5174053e5d3278cc5a922c04c333a57e 100644 (file)
--- 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;
 }
 
        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,
 {
        .name = "dummy",
        .register_commands = etm_dummy_register_commands,

diff --git a/src/target/etm_dummy.h b/src/target/etm_dummy.h
index 0e712e34e3ef4a9bea5c0e72956184897a5fd9a7..2673e4f56c3c2b88fa263fa1fc790a6ed2020a7d 100644 (file)
--- a/src/target/etm_dummy.h
+++ b/src/target/etm_dummy.h
@@ -22,6 +22,6 @@
 
 #include "etm.h"
 
 
 #include "etm.h"
 

-extern etm_capture_driver_t etm_dummy_capture_driver;
+extern struct etm_capture_driver etm_dummy_capture_driver;

 
 #endif /* ETB_H */
 
 #endif /* ETB_H */

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index 755e1b69d55734d8bc70f68f754a24e03ee38e5e..f4064f7872ea65035ac095d3b7af16a21169c77b 100644 (file)
--- 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;
 }
 
        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,
 {
        .name = "oocd_trace",
        .register_commands = oocd_trace_register_commands,

diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
index 6c3f7f922dace1feae10d6a1e43314eb10d6cc79..886ff79a69671d2d79901c9fdcaae3adf22e3c30 100644 (file)
--- 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;
 
        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 */
 
 #endif /* OOCD_TRACE_TRACE_H */