aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2011-12-22 13:14:00 +0100
committerSpencer Oliver <spen@spen-soft.co.uk>2011-12-23 09:31:21 +0000
commit7e3780de152b38c3bbae7734ad0480ef4328a27d (patch)
tree9ce9eaa04c4c9b6f5b272b5f6e55edeed7ec2d13
parente1478abc2c68759ed9ed0eacdfae04fc98261ade (diff)
jtag: only if an in_value storage is provided will the captured IR value be checked
added comments and removed bogus assert. Change-Id: Ic7aa56570a84834b1265df03d25a47fd11c4d626 Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com> Reviewed-on: http://openocd.zylin.com/297 Tested-by: jenkins Reviewed-by: Mathias Küster <kesmtp@freenet.de> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
-rw-r--r--src/jtag/core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 529e9bcd..48eef3e1 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -370,6 +370,7 @@ static void jtag_add_ir_scan_noverify_callback(struct jtag_tap *active, int dumm
jtag_add_ir_scan_noverify(active, in_fields, state);
}
+/* If fields->in_value is filled out, then the captured IR value will be checked */
void jtag_add_ir_scan(struct jtag_tap *active, struct scan_field *in_fields, tap_state_t state)
{
assert(state != TAP_RESET);
@@ -414,13 +415,6 @@ static int jtag_check_value_mask_callback(jtag_callback_data_t data0, jtag_callb
static void jtag_add_scan_check(struct jtag_tap *active, void (*jtag_add_scan)(struct jtag_tap *active, int in_num_fields, const struct scan_field *in_fields, tap_state_t state),
int in_num_fields, struct scan_field *in_fields, tap_state_t state)
{
- for (int i = 0; i < in_num_fields; i++)
- {
- struct scan_field *field = &in_fields[i];
- /* caller must provide in_buffer if needed for callback */
- assert((field->check_value == NULL) || (field->in_value != NULL));
- }
-
jtag_add_scan(active, in_num_fields, in_fields, state);
for (int i = 0; i < in_num_fields; i++)