*/
if (collecting_path) {
tap_state_t mystate;
- uint8_t uc;
switch (opcode) {
case XCOMMENT:
else
jtag_add_pathmove(pathlen, path);
- result = jtag_get_error();
+ result = jtag_execute_queue();
if (result != ERROR_OK) {
LOG_ERROR("XSVF: pathmove error %d",
result);
if (tap == NULL)
jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value,
- jtag_set_end_state(TAP_DRPAUSE));
+ TAP_DRPAUSE);
else
- jtag_add_dr_scan(tap, 1, &field, jtag_set_end_state(TAP_DRPAUSE));
+ jtag_add_dr_scan(tap, 1, &field, TAP_DRPAUSE);
jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
break;
case XSETSDRMASKS:
- LOG_ERROR("unsupported XSETSDRMASKS\n");
+ LOG_ERROR("unsupported XSETSDRMASKS");
unsupported = 1;
break;
case XSDRINC:
- LOG_ERROR("unsupported XSDRINC\n");
+ LOG_ERROR("unsupported XSDRINC");
unsupported = 1;
break;
case XSDRB:
- LOG_ERROR("unsupported XSDRB\n");
+ LOG_ERROR("unsupported XSDRB");
unsupported = 1;
break;
case XSDRC:
- LOG_ERROR("unsupported XSDRC\n");
+ LOG_ERROR("unsupported XSDRC");
unsupported = 1;
break;
case XSDRE:
- LOG_ERROR("unsupported XSDRE\n");
+ LOG_ERROR("unsupported XSDRE");
unsupported = 1;
break;
case XSDRTDOB:
- LOG_ERROR("unsupported XSDRTDOB\n");
+ LOG_ERROR("unsupported XSDRTDOB");
unsupported = 1;
break;
case XSDRTDOC:
- LOG_ERROR("unsupported XSDRTDOC\n");
+ LOG_ERROR("unsupported XSDRTDOC");
unsupported = 1;
break;
case XSDRTDOE:
- LOG_ERROR("unsupported XSDRTDOE\n");
+ LOG_ERROR("unsupported XSDRTDOE");
unsupported = 1;
break;
case XSTATE:
{
tap_state_t mystate;
- uint8_t uc;
if (read(xsvf_fd, &uc, 1) < 0)
{
XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
*/
- uint8_t wait;
+ uint8_t wait_local;
uint8_t end;
uint8_t delay_buf[4];
tap_state_t end_state;
int delay;
- if (read(xsvf_fd, &wait, 1) < 0
+ if (read(xsvf_fd, &wait_local, 1) < 0
|| read(xsvf_fd, &end, 1) < 0
|| read(xsvf_fd, delay_buf, 4) < 0)
{
break;
}
- wait_state = xsvf_to_tap(wait);
+ wait_state = xsvf_to_tap(wait_local);
end_state = xsvf_to_tap(end);
delay = be_to_h_u32(delay_buf);
uint8_t clock_buf[4];
uint8_t usecs_buf[4];
- uint8_t wait;
+ uint8_t wait_local;
uint8_t end;
tap_state_t wait_state;
tap_state_t end_state;
int clock_count;
int usecs;
- if (read(xsvf_fd, &wait, 1) < 0
+ if (read(xsvf_fd, &wait_local, 1) < 0
|| read(xsvf_fd, &end, 1) < 0
|| read(xsvf_fd, clock_buf, 4) < 0
|| read(xsvf_fd, usecs_buf, 4) < 0)
break;
}
- wait_state = xsvf_to_tap(wait);
+ wait_state = xsvf_to_tap(wait_local);
end_state = xsvf_to_tap(end);
clock_count = be_to_h_u32(clock_buf);
if (tap == NULL)
jtag_add_plain_dr_scan(field.num_bits, field.out_value, field.in_value,
- jtag_set_end_state(TAP_DRPAUSE));
+ TAP_DRPAUSE);
else
- jtag_add_dr_scan(tap, 1, &field, jtag_set_end_state(TAP_DRPAUSE));
+ jtag_add_dr_scan(tap, 1, &field, TAP_DRPAUSE);
jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
break;
default:
- LOG_ERROR("unknown xsvf command (0x%02X)\n", uc);
+ LOG_ERROR("unknown xsvf command (0x%02X)", uc);
unsupported = 1;
}