From: oharboe Date: Fri, 8 May 2009 06:45:27 +0000 (+0000) Subject: first jtag_check_value_mask usage. tested by using "arm7_9 fast_memory_access enable... X-Git-Tag: v0.2.0~841 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dd673b0b5f58cb1f796c1026c4a628eb863327a0;p=openocd first jtag_check_value_mask usage. tested by using "arm7_9 fast_memory_access enable" & "mdw 0 0x10" git-svn-id: svn://svn.berlios.de/openocd/trunk@1664 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 2432516a..eba09549 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1417,11 +1417,23 @@ void jtag_set_check_value(scan_field_t *field, u8 *value, u8 *mask, struct inval void jtag_check_value_mask(scan_field_t *field, u8 *value, u8 *mask) { + if (field->in_value==NULL) + { + LOG_ERROR("remember to fill in in_value for jtag_check_value_mask() to work!"); + return; + } + + if (value==NULL) + { + /* no checking to do */ + return; + } + jtag_execute_queue_noclear(); - + int retval=jtag_check_value_inner(field->in_value, field, value, mask); jtag_set_error(retval); - + } diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index aa5aacec..363d182e 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -251,39 +251,26 @@ int embeddedice_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) fields[0].tap = ice_reg->jtag_info->tap; fields[0].num_bits = 32; fields[0].out_value = reg->value; - fields[0].in_value = NULL; - - fields[0].in_handler = NULL; - fields[1].tap = ice_reg->jtag_info->tap; fields[1].num_bits = 5; fields[1].out_value = field1_out; buf_set_u32(fields[1].out_value, 0, 5, reg_addr); - fields[1].in_value = NULL; - - fields[1].in_handler = NULL; - fields[2].tap = ice_reg->jtag_info->tap; fields[2].num_bits = 1; fields[2].out_value = field2_out; buf_set_u32(fields[2].out_value, 0, 1, 0); - fields[2].in_value = NULL; - - fields[2].in_handler = NULL; - jtag_add_dr_scan(3, fields, TAP_INVALID); fields[0].in_value = reg->value; - jtag_set_check_value(fields+0, check_value, check_mask, NULL); /* when reading the DCC data register, leaving the address field set to * EICE_COMMS_DATA would read the register twice @@ -293,6 +280,8 @@ int embeddedice_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) jtag_add_dr_scan(3, fields, TAP_INVALID); + jtag_check_value_mask(fields+0, check_value, check_mask); + return ERROR_OK; }