field.in_handler = NULL;
field.in_handler_priv = NULL;
if (device == -1)
- jtag_add_plain_ir_scan(1, &field, TAP_PI, NULL);
+ jtag_add_plain_ir_scan(1, &field, TAP_PI);
else
- jtag_add_ir_scan(1, &field, TAP_PI, NULL);
+ jtag_add_ir_scan(1, &field, TAP_PI);
if (jtag_execute_queue() != ERROR_OK)
{
tdo_mismatch = 1;
field.in_value = NULL;
jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL);
if (device == -1)
- jtag_add_plain_dr_scan(1, &field, TAP_PD, NULL);
+ jtag_add_plain_dr_scan(1, &field, TAP_PD);
else
- jtag_add_dr_scan(1, &field, TAP_PD, NULL);
+ jtag_add_dr_scan(1, &field, TAP_PD);
if (jtag_execute_queue() != ERROR_OK)
{
tdo_mismatch = 1;
field.in_value = NULL;
jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL);
if (device == -1)
- jtag_add_plain_dr_scan(1, &field, TAP_PD, NULL);
+ jtag_add_plain_dr_scan(1, &field, TAP_PD);
else
- jtag_add_dr_scan(1, &field, TAP_PD, NULL);
+ jtag_add_dr_scan(1, &field, TAP_PD);
if (jtag_execute_queue() != ERROR_OK)
{
tdo_mismatch = 1;
}
break;
case 0x0a: /* XSETDRMASKS */
- printf("unsupported XSETSDRMASKS\n");
+ ERROR("unsupported XSETSDRMASKS\n");
unsupported = 1;
break;
case 0x0b: /* XSDRINC */
- printf("unsupported XSDRINC\n");
+ ERROR("unsupported XSDRINC\n");
unsupported = 1;
break;
case 0x0c: /* XSDRB */
field.in_handler = NULL;
field.in_handler_priv = NULL;
if (device == -1)
- jtag_add_plain_ir_scan(1, &field, xsvf_to_tap[xendir], NULL);
+ jtag_add_plain_ir_scan(1, &field, xsvf_to_tap[xendir]);
else
- jtag_add_ir_scan(1, &field, xsvf_to_tap[xendir], NULL);
+ jtag_add_ir_scan(1, &field, xsvf_to_tap[xendir]);
}
free(ir_buf);
}
}
break;
default:
- printf("unknown xsvf command (0x%2.2x)\n", c);
+ ERROR("unknown xsvf command (0x%2.2x)\n", c);
unsupported = 1;
}
if (tdo_mismatch)
{
command_print(cmd_ctx, "TDO mismatch, aborting");
- jtag_cancel_queue();
return ERROR_OK;
}
if (unsupported)
{
command_print(cmd_ctx, "unsupported xsvf command encountered, aborting");
- jtag_cancel_queue();
return ERROR_OK;
}
if (do_abort)
{
command_print(cmd_ctx, "premature end detected, aborting");
- jtag_cancel_queue();
return ERROR_OK;
}