Browse Source

etmv1_trace_data_t -> struct etmv1_trace_data

Remove misleading typedef and redundant suffix from struct etmv1_trace_data.
tags/v0.4.0-rc1
Zachary T Welch 14 years ago
parent
commit
99614219ad
4 changed files with 6 additions and 6 deletions
  1. +1
    -1
      src/target/etb.c
  2. +1
    -1
      src/target/etm.c
  3. +3
    -3
      src/target/etm.h
  4. +1
    -1
      src/target/oocd_trace.c

+ 1
- 1
src/target/etb.c View File

@@ -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++)
{


+ 1
- 1
src/target/etm.c View File

@@ -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");


+ 3
- 3
src/target/etm.h View File

@@ -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 */


+ 1
- 1
src/target/oocd_trace.c View File

@@ -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++)
{


Loading…
Cancel
Save