X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftarget%2Fetb.c;h=ff4113e5c1e568b1550464c55566803bf420fff6;hb=3d6bcf07921753141a3905ee5619724573460cb3;hp=53f9f30e6d0c06565bf5aed3441e68d5cd7c8462;hpb=b930514e2f3e2a83e075e8c19ae0d38bbd2b27dc;p=openocd.git

diff --git a/src/target/etb.c b/src/target/etb.c
index 53f9f30e6d..ff4113e5c1 100644
--- a/src/target/etb.c
+++ b/src/target/etb.c
@@ -79,7 +79,7 @@ int etb_set_instr(etb_t *etb, u32 new_instr)
 		field.in_handler = NULL;
 		field.in_handler_priv = NULL;
 				
-		jtag_add_ir_scan(1, &field, -1, NULL);
+		jtag_add_ir_scan(1, &field, -1);
 		
 		free(field.out_value);
 	}
@@ -106,7 +106,7 @@ int etb_scann(etb_t *etb, u32 new_scan_chain)
 		
 		/* select INTEST instruction */
 		etb_set_instr(etb, 0x2);
-		jtag_add_dr_scan(1, &field, -1, NULL);
+		jtag_add_dr_scan(1, &field, -1);
 		
 		etb->cur_scan_chain = new_scan_chain;
 		
@@ -215,7 +215,7 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
 	fields[2].in_handler = NULL;
 	fields[2].in_handler_priv = NULL;
 	
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 
 	fields[0].in_handler = buf_to_u32_handler;
 	
@@ -231,7 +231,7 @@ int etb_read_ram(etb_t *etb, u32 *data, int num_frames)
 			buf_set_u32(fields[1].out_value, 0, 7, 0);
 		
 		fields[0].in_handler_priv = &data[i];
-		jtag_add_dr_scan(3, fields, -1, NULL);
+		jtag_add_dr_scan(3, fields, -1);
 	}
 	
 	jtag_execute_queue();
@@ -286,17 +286,17 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
 	fields[2].in_handler = NULL;
 	fields[2].in_handler_priv = NULL;
 	
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 	
 	/* read the identification register in the second run, to make sure we
 	 * don't read the ETB data register twice, skipping every second entry
 	 */
 	buf_set_u32(fields[1].out_value, 0, 7, 0x0);
 	fields[0].in_value = reg->value;
-	fields[0].in_check_value = check_value;
-	fields[0].in_check_mask = check_mask;
-		
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	
+	jtag_set_check_value(fields+0, check_value, check_mask, NULL);
+	
+	jtag_add_dr_scan(3, fields, -1);
 
 	free(fields[1].out_value);
 	free(fields[2].out_value);
@@ -381,7 +381,7 @@ int etb_write_reg(reg_t *reg, u32 value)
 	fields[2].in_handler = NULL;
 	fields[2].in_handler_priv = NULL;
 	
-	jtag_add_dr_scan(3, fields, -1, NULL);
+	jtag_add_dr_scan(3, fields, -1);
 	
 	free(fields[0].out_value);
 	free(fields[1].out_value);