interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

etb_t -> struct etb 

Remove misleading typedef and redundant suffix from struct etb.
This commit is contained in:
Zachary T Welch 2009-11-13 09:27:28 -08:00
parent 4952eadd8f
commit 6421c2075c
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/target/etb.c
View File

@ -42,7 +42,7 @@ static int etb_reg_arch_type = -1;
static int etb_get_reg(reg_t *reg); static int etb_get_reg(reg_t *reg);
static int etb_set_instr(etb_t *etb, uint32_t new_instr) static int etb_set_instr(struct etb *etb, uint32_t new_instr)
{ {
struct jtag_tap *tap; struct jtag_tap *tap;
@ -69,7 +69,7 @@ static int etb_set_instr(etb_t *etb, uint32_t new_instr)
return ERROR_OK; return ERROR_OK;
} }
static int etb_scann(etb_t *etb, uint32_t new_scan_chain) static int etb_scann(struct etb *etb, uint32_t new_scan_chain)
{ {
if (etb->cur_scan_chain != new_scan_chain) if (etb->cur_scan_chain != new_scan_chain)
{ {
@ -121,7 +121,7 @@ static int etb_get_reg(reg_t *reg)
return ERROR_OK; return ERROR_OK;
} }
struct reg_cache* etb_build_reg_cache(etb_t *etb) struct reg_cache* etb_build_reg_cache(struct etb *etb)
{ {
struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache)); struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache));
reg_t *reg_list = NULL; reg_t *reg_list = NULL;
@ -171,7 +171,7 @@ static void etb_getbuf(jtag_callback_data_t arg)
} }
static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames) static int etb_read_ram(struct etb *etb, uint32_t *data, int num_frames)
{ {
struct scan_field fields[3]; struct scan_field fields[3];
int i; int i;
@ -384,7 +384,7 @@ COMMAND_HANDLER(handle_etb_config_command)
if (arm->etm) if (arm->etm)
{ {
etb_t *etb = malloc(sizeof(etb_t)); struct etb *etb = malloc(sizeof(struct etb));
arm->etm->capture_driver_priv = etb; arm->etm->capture_driver_priv = etb;
@ -417,7 +417,7 @@ static int etb_register_commands(struct command_context_s *cmd_ctx)
static int etb_init(etm_context_t *etm_ctx) static int etb_init(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; struct etb *etb = etm_ctx->capture_driver_priv;
etb->etm_ctx = etm_ctx; etb->etm_ctx = etm_ctx;
@ -434,7 +434,7 @@ static int etb_init(etm_context_t *etm_ctx)
static trace_status_t etb_status(etm_context_t *etm_ctx) static trace_status_t etb_status(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; struct etb *etb = etm_ctx->capture_driver_priv;
reg_t *control = &etb->reg_cache->reg_list[ETB_CTRL]; reg_t *control = &etb->reg_cache->reg_list[ETB_CTRL];
reg_t *status = &etb->reg_cache->reg_list[ETB_STATUS]; reg_t *status = &etb->reg_cache->reg_list[ETB_STATUS];
trace_status_t retval = 0; trace_status_t retval = 0;
@ -486,7 +486,7 @@ static trace_status_t etb_status(etm_context_t *etm_ctx)
static int etb_read_trace(etm_context_t *etm_ctx) static int etb_read_trace(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; struct etb *etb = etm_ctx->capture_driver_priv;
int first_frame = 0; int first_frame = 0;
int num_frames = etb->ram_depth; int num_frames = etb->ram_depth;
uint32_t *trace_data = NULL; uint32_t *trace_data = NULL;
@ -636,7 +636,7 @@ static int etb_read_trace(etm_context_t *etm_ctx)
static int etb_start_capture(etm_context_t *etm_ctx) static int etb_start_capture(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; struct etb *etb = etm_ctx->capture_driver_priv;
uint32_t etb_ctrl_value = 0x1; uint32_t etb_ctrl_value = 0x1;
uint32_t trigger_count; uint32_t trigger_count;
@ -670,7 +670,7 @@ static int etb_start_capture(etm_context_t *etm_ctx)
static int etb_stop_capture(etm_context_t *etm_ctx) static int etb_stop_capture(etm_context_t *etm_ctx)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; struct etb *etb = etm_ctx->capture_driver_priv;
reg_t *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL]; reg_t *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL];
etb_write_reg(etb_ctrl_reg, 0x0); etb_write_reg(etb_ctrl_reg, 0x0);

8
src/target/etb.h
View File

@ -34,7 +34,7 @@ enum
ETB_CTRL = 0x08, ETB_CTRL = 0x08,
}; };
typedef struct etb_s struct etb
{ {
etm_context_t *etm_ctx; etm_context_t *etm_ctx;
struct jtag_tap *tap; struct jtag_tap *tap;
@ -44,16 +44,16 @@ typedef struct etb_s
/* ETB parameters */ /* ETB parameters */
uint32_t ram_depth; uint32_t ram_depth;
uint32_t ram_width; uint32_t ram_width;
} etb_t; };
struct etb_reg struct etb_reg
{ {
uint32_t addr; uint32_t addr;
etb_t *etb; struct etb *etb;
}; };
extern struct etm_capture_driver etb_capture_driver; extern struct etm_capture_driver etb_capture_driver;
struct reg_cache* etb_build_reg_cache(etb_t *etb); struct reg_cache* etb_build_reg_cache(struct etb *etb);
#endif /* ETB_H */ #endif /* ETB_H */

2
src/target/etm.c
View File

@ -391,7 +391,7 @@ struct reg_cache *etm_build_reg_cache(target_t *target,
/* the ETM might have an ETB connected */ /* the ETM might have an ETB connected */
if (strcmp(etm_ctx->capture_driver->name, "etb") == 0) if (strcmp(etm_ctx->capture_driver->name, "etb") == 0)
{ {
etb_t *etb = etm_ctx->capture_driver_priv; struct etb *etb = etm_ctx->capture_driver_priv;
if (!etb) if (!etb)
{ {