target: trace: drop useless typedef trace_status_t

No need to use a typedef for an enum.
Drop it.

Change-Id: I31e0e3869c7277bcb14e05cfcac82c9655963ae6
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8704
Tested-by: jenkins
Reviewed-by: zapb <dev@zapb.de>

diff --git a/src/target/etb.c b/src/target/etb.c
index 3b9004bb85271a4c9952c53913c56c1f989809c9..fb3112d70a373dc72b093050e6b7b2e371e36550 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -454,12 +454,12 @@ static int etb_init(struct etm_context *etm_ctx)
        return ERROR_OK;
 }
 
-static trace_status_t etb_status(struct etm_context *etm_ctx)
+static enum trace_status etb_status(struct etm_context *etm_ctx)
 {
        struct etb *etb = etm_ctx->capture_driver_priv;
        struct reg *control = &etb->reg_cache->reg_list[ETB_CTRL];
        struct reg *status = &etb->reg_cache->reg_list[ETB_STATUS];
-       trace_status_t retval = 0;
+       enum trace_status retval = 0;
        int etb_timeout = 100;
 
        etb->etm_ctx = etm_ctx;

diff --git a/src/target/etm.c b/src/target/etm.c
index 53d5cb68ca32e500b63cf40ff6527dde45b8242c..d9a3cdc5e569cf6f59cc49c316c59ee0208da4d4 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1567,7 +1567,7 @@ COMMAND_HANDLER(handle_etm_status_command)
        struct target *target;
        struct arm *arm;
        struct etm_context *etm;
-       trace_status_t trace_status;
+       enum trace_status trace_status;
 
        target = get_current_target(CMD_CTX);
        arm = target_to_arm(target);

diff --git a/src/target/etm.h b/src/target/etm.h
index 6c5b5e5953207615a14c02dfc5b919744dda963c..e18549dfe2b67395be6d45864661f9cd7f87e958 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -126,7 +126,7 @@ struct etm_capture_driver {
        const char *name;
        const struct command_registration *commands;
        int (*init)(struct etm_context *etm_ctx);
-       trace_status_t (*status)(struct etm_context *etm_ctx);
+       enum trace_status (*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);
@@ -153,7 +153,7 @@ struct etm_context {
        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 */
-       trace_status_t capture_status;  /* current state of capture run */
+       enum trace_status capture_status;       /* current state of capture run */
        struct etmv1_trace_data *trace_data;    /* trace data */
        uint32_t trace_depth;           /* number of cycles to be analyzed, 0 if no data available */
        uint32_t control;       /* shadow of ETM_CTRL */

diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 8deccf5f9d7a19eb0c18681d4342240ff0eb5b8c..2709b6e9d89764f01214cb89126c349064e44781 100644 (file)
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -65,7 +65,7 @@ static int etm_dummy_init(struct etm_context *etm_ctx)
        return ERROR_OK;
 }
 
-static trace_status_t etm_dummy_status(struct etm_context *etm_ctx)
+static enum trace_status etm_dummy_status(struct etm_context *etm_ctx)
 {
        return TRACE_IDLE;
 }

diff --git a/src/target/trace.h b/src/target/trace.h
index e3d787eddf25ac92334fa1053cf559919ceea6b1..dc3ab571243903eee5d4638ed081d5a32cc661f9 100644 (file)
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -33,13 +33,13 @@ struct trace {
  * to *hardware* tracing ... split such "real" tracing out from
  * the contrib/libdcc support.
  */
-typedef enum trace_status {
+enum trace_status {
        TRACE_IDLE = 0x0,
        TRACE_RUNNING = 0x1,
        TRACE_TRIGGERED = 0x2,
        TRACE_COMPLETED = 0x4,
        TRACE_OVERFLOWED = 0x8,
-} trace_status_t;
+};
 
 int trace_point(struct target *target, uint32_t number);
 int trace_register_commands(struct command_context *cmd_ctx);