From: Zachary T Welch Date: Fri, 13 Nov 2009 16:42:24 +0000 (-0800) Subject: etb_reg_t -> struct etb_reg X-Git-Tag: v0.4.0-rc1~668 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=01f9dc18fcce8d5a0e02e56822d580da81570fdc;p=openocd etb_reg_t -> struct etb_reg Remove misleading typedef and redundant suffix from struct etb_reg. --- diff --git a/src/target/etb.c b/src/target/etb.c index 1315b71a..6a711d42 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -125,7 +125,7 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb) { reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t)); reg_t *reg_list = NULL; - etb_reg_t *arch_info = NULL; + struct etb_reg *arch_info = NULL; int num_regs = 9; int i; @@ -135,7 +135,7 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb) /* the actual registers are kept in two arrays */ reg_list = calloc(num_regs, sizeof(reg_t)); - arch_info = calloc(num_regs, sizeof(etb_reg_t)); + arch_info = calloc(num_regs, sizeof(struct etb_reg)); /* fill in values for the reg cache */ reg_cache->name = "etb registers"; @@ -227,7 +227,7 @@ static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames) static int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* check_mask) { - etb_reg_t *etb_reg = reg->arch_info; + struct etb_reg *etb_reg = reg->arch_info; uint8_t reg_addr = etb_reg->addr & 0x7f; struct scan_field fields[3]; @@ -313,7 +313,7 @@ static int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf) static int etb_write_reg(reg_t *reg, uint32_t value) { - etb_reg_t *etb_reg = reg->arch_info; + struct etb_reg *etb_reg = reg->arch_info; uint8_t reg_addr = etb_reg->addr & 0x7f; struct scan_field fields[3]; diff --git a/src/target/etb.h b/src/target/etb.h index 6700ecbb..15171f57 100644 --- a/src/target/etb.h +++ b/src/target/etb.h @@ -46,11 +46,11 @@ typedef struct etb_s uint32_t ram_width; } etb_t; -typedef struct etb_reg_s +struct etb_reg { uint32_t addr; etb_t *etb; -} etb_reg_t; +}; extern etm_capture_driver_t etb_capture_driver;