From d0c19e0a9d51211953a363026c662d290542fe85 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 09:35:48 -0800 Subject: [PATCH] etm_context_t -> struct etm_context Remove misleading typedef and redundant suffix from struct etm_context. --- src/target/armv4_5.h | 2 +- src/target/etb.c | 10 +++++----- src/target/etb.h | 2 +- src/target/etm.c | 40 ++++++++++++++++++++-------------------- src/target/etm.h | 18 +++++++++--------- src/target/etm_dummy.c | 10 +++++----- src/target/oocd_trace.c | 10 +++++----- src/target/oocd_trace.h | 2 +- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h index 89879163b..3c65069e0 100644 --- a/src/target/armv4_5.h +++ b/src/target/armv4_5.h @@ -96,7 +96,7 @@ typedef struct arm bool is_armv4; /** Handle for the Embedded Trace Module, if one is present. */ - struct etm *etm; + struct etm_context *etm; int (*full_context)(struct target_s *target); int (*read_core_reg)(struct target_s *target, diff --git a/src/target/etb.c b/src/target/etb.c index eed961b0d..6f9562abd 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -415,7 +415,7 @@ static int etb_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -static int etb_init(etm_context_t *etm_ctx) +static int etb_init(struct etm_context *etm_ctx) { struct etb *etb = etm_ctx->capture_driver_priv; @@ -432,7 +432,7 @@ static int etb_init(etm_context_t *etm_ctx) return ERROR_OK; } -static trace_status_t etb_status(etm_context_t *etm_ctx) +static trace_status_t etb_status(struct etm_context *etm_ctx) { struct etb *etb = etm_ctx->capture_driver_priv; reg_t *control = &etb->reg_cache->reg_list[ETB_CTRL]; @@ -484,7 +484,7 @@ static trace_status_t etb_status(etm_context_t *etm_ctx) return retval; } -static int etb_read_trace(etm_context_t *etm_ctx) +static int etb_read_trace(struct etm_context *etm_ctx) { struct etb *etb = etm_ctx->capture_driver_priv; int first_frame = 0; @@ -634,7 +634,7 @@ static int etb_read_trace(etm_context_t *etm_ctx) return ERROR_OK; } -static int etb_start_capture(etm_context_t *etm_ctx) +static int etb_start_capture(struct etm_context *etm_ctx) { struct etb *etb = etm_ctx->capture_driver_priv; uint32_t etb_ctrl_value = 0x1; @@ -668,7 +668,7 @@ static int etb_start_capture(etm_context_t *etm_ctx) return ERROR_OK; } -static int etb_stop_capture(etm_context_t *etm_ctx) +static int etb_stop_capture(struct etm_context *etm_ctx) { struct etb *etb = etm_ctx->capture_driver_priv; reg_t *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL]; diff --git a/src/target/etb.h b/src/target/etb.h index e015bad19..49385ee90 100644 --- a/src/target/etb.h +++ b/src/target/etb.h @@ -36,7 +36,7 @@ enum struct etb { - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; struct jtag_tap *tap; uint32_t cur_scan_chain; struct reg_cache *reg_cache; diff --git a/src/target/etm.c b/src/target/etm.c index 21044e544..751ea421a 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -229,7 +229,7 @@ static command_t *etm_cmd; /* Look up register by ID ... most ETM instances only * support a subset of the possible registers. */ -static reg_t *etm_reg_lookup(etm_context_t *etm_ctx, unsigned id) +static reg_t *etm_reg_lookup(struct etm_context *etm_ctx, unsigned id) { struct reg_cache *cache = etm_ctx->reg_cache; int i; @@ -280,7 +280,7 @@ static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info, } struct reg_cache *etm_build_reg_cache(target_t *target, - struct arm_jtag *jtag_info, etm_context_t *etm_ctx) + struct arm_jtag *jtag_info, struct etm_context *etm_ctx) { struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache)); reg_t *reg_list = NULL; @@ -426,7 +426,7 @@ int etm_setup(target_t *target) int retval; uint32_t etm_ctrl_value; struct arm *arm = target_to_arm(target); - etm_context_t *etm_ctx = arm->etm; + struct etm_context *etm_ctx = arm->etm; reg_t *etm_ctrl_reg; etm_ctrl_reg = etm_reg_lookup(etm_ctx, ETM_CTRL); @@ -636,7 +636,7 @@ static struct etm_capture_driver *etm_capture_drivers[] = NULL }; -static int etm_read_instruction(etm_context_t *ctx, struct arm_instruction *instruction) +static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction *instruction) { int i; int section = -1; @@ -704,7 +704,7 @@ static int etm_read_instruction(etm_context_t *ctx, struct arm_instruction *inst return ERROR_OK; } -static int etmv1_next_packet(etm_context_t *ctx, uint8_t *packet, int apo) +static int etmv1_next_packet(struct etm_context *ctx, uint8_t *packet, int apo) { while (ctx->data_index < ctx->trace_depth) { @@ -769,7 +769,7 @@ static int etmv1_next_packet(etm_context_t *ctx, uint8_t *packet, int apo) return -1; } -static int etmv1_branch_address(etm_context_t *ctx) +static int etmv1_branch_address(struct etm_context *ctx) { int retval; uint8_t packet; @@ -855,7 +855,7 @@ static int etmv1_branch_address(etm_context_t *ctx) return 0; } -static int etmv1_data(etm_context_t *ctx, int size, uint32_t *data) +static int etmv1_data(struct etm_context *ctx, int size, uint32_t *data) { int j; uint8_t buf[4]; @@ -884,7 +884,7 @@ static int etmv1_data(etm_context_t *ctx, int size, uint32_t *data) return 0; } -static int etmv1_analyze_trace(etm_context_t *ctx, struct command_context_s *cmd_ctx) +static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context_s *cmd_ctx) { int retval; struct arm_instruction instruction; @@ -1251,7 +1251,7 @@ COMMAND_HANDLER(handle_etm_tracemode_command) { target_t *target = get_current_target(cmd_ctx); struct arm *arm = target_to_arm(target); - struct etm *etm; + struct etm_context *etm; if (!is_arm(arm)) { command_print(cmd_ctx, "ETM: current target isn't an ARM"); @@ -1374,7 +1374,7 @@ COMMAND_HANDLER(handle_etm_config_command) target_t *target; struct arm *arm; etm_portmode_t portmode = 0x0; - struct etm *etm_ctx; + struct etm_context *etm_ctx; int i; if (argc != 5) @@ -1477,7 +1477,7 @@ COMMAND_HANDLER(handle_etm_config_command) return ERROR_FAIL; } - etm_ctx = calloc(1, sizeof(etm_context_t)); + etm_ctx = calloc(1, sizeof(struct etm_context)); if (!etm_ctx) { LOG_DEBUG("out of memory"); return ERROR_FAIL; @@ -1523,7 +1523,7 @@ COMMAND_HANDLER(handle_etm_info_command) { target_t *target; struct arm *arm; - etm_context_t *etm; + struct etm_context *etm; reg_t *etm_sys_config_reg; int max_port_size; uint32_t config; @@ -1655,7 +1655,7 @@ COMMAND_HANDLER(handle_etm_status_command) { target_t *target; struct arm *arm; - etm_context_t *etm; + struct etm_context *etm; trace_status_t trace_status; target = get_current_target(cmd_ctx); @@ -1731,7 +1731,7 @@ COMMAND_HANDLER(handle_etm_image_command) { target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; if (argc < 1) { @@ -1791,7 +1791,7 @@ COMMAND_HANDLER(handle_etm_dump_command) struct fileio file; target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; uint32_t i; if (argc != 1) @@ -1859,7 +1859,7 @@ COMMAND_HANDLER(handle_etm_load_command) struct fileio file; target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; uint32_t i; if (argc != 1) @@ -1942,7 +1942,7 @@ COMMAND_HANDLER(handle_etm_trigger_percent_command) { target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; target = get_current_target(cmd_ctx); arm = target_to_arm(target); @@ -1983,7 +1983,7 @@ COMMAND_HANDLER(handle_etm_start_command) { target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; reg_t *etm_ctrl_reg; target = get_current_target(cmd_ctx); @@ -2031,7 +2031,7 @@ COMMAND_HANDLER(handle_etm_stop_command) { target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; reg_t *etm_ctrl_reg; target = get_current_target(cmd_ctx); @@ -2070,7 +2070,7 @@ COMMAND_HANDLER(handle_etm_analyze_command) { target_t *target; struct arm *arm; - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; int retval; target = get_current_target(cmd_ctx); diff --git a/src/target/etm.h b/src/target/etm.h index 63e31f1b6..3de54eef2 100644 --- a/src/target/etm.h +++ b/src/target/etm.h @@ -121,17 +121,17 @@ typedef enum } etmv1_tracemode_t; /* forward-declare ETM context */ -struct etm; +struct etm_context; struct etm_capture_driver { char *name; int (*register_commands)(struct command_context_s *cmd_ctx); - int (*init)(struct etm *etm_ctx); - trace_status_t (*status)(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); + int (*init)(struct etm_context *etm_ctx); + trace_status_t (*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); }; enum @@ -152,7 +152,7 @@ struct etmv1_trace_data * this will have to be split into version independent elements * and a version specific part */ -typedef struct etm +struct etm_context { target_t *target; /* target this ETM is connected to */ struct reg_cache *reg_cache; /* ETM register cache */ @@ -179,7 +179,7 @@ typedef struct etm uint32_t last_branch_reason; /* type of last branch encountered */ uint32_t last_ptr; /* address of the last data access */ uint32_t last_instruction; /* index of last executed (to calc timings) */ -} etm_context_t; +}; /* PIPESTAT values */ typedef enum @@ -208,7 +208,7 @@ typedef enum } etmv1_branch_reason_t; struct reg_cache* etm_build_reg_cache(target_t *target, - struct arm_jtag *jtag_info, etm_context_t *etm_ctx); + struct arm_jtag *jtag_info, struct etm_context *etm_ctx); int etm_setup(target_t *target); diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c index 4d975c6a5..eb8377b7f 100644 --- a/src/target/etm_dummy.c +++ b/src/target/etm_dummy.c @@ -69,27 +69,27 @@ static int etm_dummy_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -static int etm_dummy_init(etm_context_t *etm_ctx) +static int etm_dummy_init(struct etm_context *etm_ctx) { return ERROR_OK; } -static trace_status_t etm_dummy_status(etm_context_t *etm_ctx) +static trace_status_t etm_dummy_status(struct etm_context *etm_ctx) { return TRACE_IDLE; } -static int etm_dummy_read_trace(etm_context_t *etm_ctx) +static int etm_dummy_read_trace(struct etm_context *etm_ctx) { return ERROR_OK; } -static int etm_dummy_start_capture(etm_context_t *etm_ctx) +static int etm_dummy_start_capture(struct etm_context *etm_ctx) { return ERROR_ETM_PORTMODE_NOT_SUPPORTED; } -static int etm_dummy_stop_capture(etm_context_t *etm_ctx) +static int etm_dummy_stop_capture(struct etm_context *etm_ctx) { return ERROR_OK; } diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c index c5f8b808a..6011b6829 100644 --- a/src/target/oocd_trace.c +++ b/src/target/oocd_trace.c @@ -96,7 +96,7 @@ static int oocd_trace_read_memory(struct oocd_trace *oocd_trace, uint8_t *data, return ERROR_OK; } -static int oocd_trace_init(etm_context_t *etm_ctx) +static int oocd_trace_init(struct etm_context *etm_ctx) { uint8_t trash[256]; struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv; @@ -143,7 +143,7 @@ static int oocd_trace_init(etm_context_t *etm_ctx) return ERROR_OK; } -static trace_status_t oocd_trace_status(etm_context_t *etm_ctx) +static trace_status_t oocd_trace_status(struct etm_context *etm_ctx) { struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv; uint32_t status; @@ -175,7 +175,7 @@ static trace_status_t oocd_trace_status(etm_context_t *etm_ctx) return etm_ctx->capture_status; } -static int oocd_trace_read_trace(etm_context_t *etm_ctx) +static int oocd_trace_read_trace(struct etm_context *etm_ctx) { struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv; uint32_t status, address; @@ -233,7 +233,7 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx) return ERROR_OK; } -static int oocd_trace_start_capture(etm_context_t *etm_ctx) +static int oocd_trace_start_capture(struct etm_context *etm_ctx) { struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv; uint32_t control = 0x1; /* 0x1: enabled */ @@ -266,7 +266,7 @@ static int oocd_trace_start_capture(etm_context_t *etm_ctx) return ERROR_OK; } -static int oocd_trace_stop_capture(etm_context_t *etm_ctx) +static int oocd_trace_stop_capture(struct etm_context *etm_ctx) { struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv; diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h index 49b4b8901..8234b6591 100644 --- a/src/target/oocd_trace.h +++ b/src/target/oocd_trace.h @@ -48,7 +48,7 @@ enum struct oocd_trace { - etm_context_t *etm_ctx; + struct etm_context *etm_ctx; char *tty; int tty_fd; struct termios oldtio, newtio;