summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/target/etb.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/target/etb.c b/src/target/etb.c
index 81e45156..5f6e648e 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -177,7 +177,7 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
fields[0].num_bits = 32;
fields[0].out_value = NULL;
fields[0].in_value = NULL;
-
+
fields[1].tap = etb->tap;
fields[1].num_bits = 7;
fields[1].out_value = malloc(1);
@@ -233,18 +233,24 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
fields[0].num_bits = 32;
fields[0].out_value = reg->value;
fields[0].in_value = NULL;
+ fields[0].check_value = NULL;
+ fields[0].check_mask = NULL;
fields[1].tap = etb_reg->etb->tap;
fields[1].num_bits = 7;
fields[1].out_value = malloc(1);
buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
fields[1].in_value = NULL;
+ fields[1].check_value = NULL;
+ fields[1].check_mask = NULL;
fields[2].tap = etb_reg->etb->tap;
fields[2].num_bits = 1;
fields[2].out_value = malloc(1);
buf_set_u32(fields[2].out_value, 0, 1, 0);
fields[2].in_value = NULL;
+ fields[2].check_value = NULL;
+ fields[2].check_mask = NULL;
jtag_add_dr_scan(3, fields, TAP_INVALID);
@@ -253,10 +259,10 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
*/
buf_set_u32(fields[1].out_value, 0, 7, 0x0);
fields[0].in_value = reg->value;
+ fields[0].check_value = check_value;
+ fields[0].check_mask = check_mask;
- jtag_add_dr_scan(3, fields, TAP_INVALID);
-
- jtag_check_value_mask(fields+0, check_value, check_mask);
+ jtag_add_dr_scan_check(3, fields, TAP_INVALID);
free(fields[1].out_value);
free(fields[2].out_value);