diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 08:42:46 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 11:58:11 -0800 |
| commit | 99614219ad111c124ea5d5f997bb388cbcf00e32 (patch) | |
| tree | 08d933ddbcad053af55c55892add320f7ea21ba7 /src | |
| parent | e2001ba2116fe5c0c75f7953b5fbe35da65fa29d (diff) | |
| download | openocd+libswd-99614219ad111c124ea5d5f997bb388cbcf00e32.tar.gz openocd+libswd-99614219ad111c124ea5d5f997bb388cbcf00e32.tar.bz2 openocd+libswd-99614219ad111c124ea5d5f997bb388cbcf00e32.tar.xz openocd+libswd-99614219ad111c124ea5d5f997bb388cbcf00e32.zip | |
etmv1_trace_data_t -> struct etmv1_trace_data
Remove misleading typedef and redundant suffix from struct etmv1_trace_data.
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/etb.c | 2 | ||||
| -rw-r--r-- | src/target/etm.c | 2 | ||||
| -rw-r--r-- | src/target/etm.h | 6 | ||||
| -rw-r--r-- | src/target/oocd_trace.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/target/etb.c b/src/target/etb.c index d6bf73f4..44decfef 100644 --- 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 f423835f..9952279d 100644 --- 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 317474ce..08f9c226 100644 --- 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 f4064f78..b9cd03a2 100644 --- 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++) { |