etmv1_trace_data_t -> struct etmv1_trace_data

Remove misleading typedef and redundant suffix from struct etmv1_trace_data.

diff --git a/src/target/etb.c b/src/target/etb.c
index d6bf73f46e02e497d6fe28ec4a42245172f4bccd..44decfefecb67669f846afa474f16428fc03c3c9 100644 (file)
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -527,7 +527,7 @@ static int etb_read_trace(etm_context_t *etm_ctx)
        else
                etm_ctx->trace_depth = num_frames;
 
-       etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth);
+       etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
 
        for (i = 0, j = 0; i < num_frames; i++)
        {

diff --git a/src/target/etm.c b/src/target/etm.c
index f423835f7f2fdeaf5177284f6af47982c4ac4ef4..9952279d2f76ec497f92f4e3ffcf33a3812602cf 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1914,7 +1914,7 @@ COMMAND_HANDLER(handle_etm_load_command)
          fileio_read_u32(&file, &tmp); etm_ctx->tracemode = tmp;
          fileio_read_u32(&file, &etm_ctx->trace_depth);
        }
-       etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth);
+       etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
        if (etm_ctx->trace_data == NULL)
        {
                command_print(cmd_ctx, "not enough memory to perform operation");

diff --git a/src/target/etm.h b/src/target/etm.h
index 317474ce079f9be254dd733fe5db448484ee3728..08f9c2269bda35084a745b803c4bdfabd344be53 100644 (file)
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -140,12 +140,12 @@ enum
        ETMV1_TRIGGER_CYCLE = 0x2,
 };
 
-typedef struct etmv1_trace_data_s
+struct etmv1_trace_data
 {
        uint8_t pipestat;       /* bits 0-2 pipeline status */
        uint16_t packet;                /* packet data (4, 8 or 16 bit) */
        int flags;              /* ETMV1_TRACESYNC_CYCLE, ETMV1_TRIGGER_CYCLE */
-} etmv1_trace_data_t;
+};
 
 /* describe a trace context
  * if support for ETMv2 or ETMv3 is to be implemented,
@@ -160,7 +160,7 @@ typedef struct etm
        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 */
-       etmv1_trace_data_t *trace_data; /* trace data */
+       struct etmv1_trace_data *trace_data;    /* trace data */
        uint32_t trace_depth;           /* number of cycles to be analyzed, 0 if no data available */
        etm_portmode_t portmode;        /* normal, multiplexed or demultiplexed */
        etmv1_tracemode_t tracemode;    /* type of info trace contains */

diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index f4064f7872ea65035ac095d3b7af16a21169c77b..b9cd03a2e0dfe3074e882eef33ceb17f02392013 100644 (file)
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -208,7 +208,7 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx)
        }
 
        etm_ctx->trace_depth = num_frames * 16;
-       etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth);
+       etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
 
        for (i = 0; i < num_frames * 16; i++)
        {