* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2008 Peter Hettkamp *
! Set the maximum loop count to 25.
LCOUNT 25;
-! Step to DRPAUSE give 5 clocks and wait for 1.00e+000 SEC.
+! Step to DRPAUSE give 5 clocks and wait for 1.00e + 000 SEC.
LDELAY DRPAUSE 5 TCK 1.00E-003 SEC;
! Test for the completed status. Match means pass.
! Loop back to LDELAY line if not match and loop count less than 25.
/* map xsvf tap state to an openocd "tap_state_t" */
-static tap_state_t xsvf_to_tap( int xsvf_state )
+static tap_state_t xsvf_to_tap(int xsvf_state)
{
tap_state_t ret;
- switch( xsvf_state )
+ switch (xsvf_state)
{
case XSV_RESET: ret = TAP_RESET; break;
case XSV_IDLE: ret = TAP_IDLE; break;
case XSV_IREXIT2: ret = TAP_IREXIT2; break;
case XSV_IRUPDATE: ret = TAP_IRUPDATE; break;
default:
- LOG_ERROR( "UNKNOWN XSVF STATE 0x%02X", xsvf_state );
+ LOG_ERROR("UNKNOWN XSVF STATE 0x%02X", xsvf_state);
exit(1);
}
return ERROR_OK;
}
-static int xsvf_read_buffer(int num_bits, int fd, u8* buf)
+static int xsvf_read_buffer(int num_bits, int fd, uint8_t* buf)
{
int num_bytes;
static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- u8 *dr_out_buf = NULL; /* from host to device (TDI) */
- u8 *dr_in_buf = NULL; /* from device to host (TDO) */
- u8 *dr_in_mask = NULL;
+ uint8_t *dr_out_buf = NULL; /* from host to device (TDI) */
+ uint8_t *dr_in_buf = NULL; /* from device to host (TDO) */
+ uint8_t *dr_in_mask = NULL;
int xsdrsize = 0;
int xruntest = 0; /* number of TCK cycles OR microseconds */
tap_state_t xendir = TAP_IDLE; /* see page 8 of the SVF spec, initial xendir to be TAP_IDLE */
tap_state_t xenddr = TAP_IDLE;
- u8 opcode;
- u8 uc;
+ uint8_t opcode;
+ uint8_t uc;
long file_offset = 0;
int loop_count = 0;
if (strcmp(args[0], "plain") != 0)
{
- tap = jtag_TapByString( args[0] );
- if (!tap )
+ tap = jtag_tap_by_string(args[0]);
+ if (!tap)
{
- command_print( cmd_ctx, "Tap: %s unknown", args[0] );
+ command_print(cmd_ctx, "Tap: %s unknown", args[0]);
return ERROR_FAIL;
}
}
LOG_USER("xsvf processing file: \"%s\"", filename);
- while( read(xsvf_fd, &opcode, 1) > 0 )
+ while (read(xsvf_fd, &opcode, 1) > 0)
{
/* record the position of the just read opcode within the file */
file_offset = lseek(xsvf_fd, 0, SEEK_CUR) - 1;
case XRUNTEST:
{
- u8 xruntest_buf[4];
+ uint8_t xruntest_buf[4];
if (read(xsvf_fd, xruntest_buf, 4) < 0)
{
case XREPEAT:
{
- u8 myrepeat;
+ uint8_t myrepeat;
if (read(xsvf_fd, &myrepeat, 1) < 0)
do_abort = 1;
else
{
xrepeat = myrepeat;
- LOG_DEBUG("XREPEAT %d", xrepeat );
+ LOG_DEBUG("XREPEAT %d", xrepeat);
}
}
break;
case XSDRSIZE:
{
- u8 xsdrsize_buf[4];
+ uint8_t xsdrsize_buf[4];
if (read(xsvf_fd, xsdrsize_buf, 4) < 0)
{
xsdrsize = be_to_h_u32(xsdrsize_buf);
LOG_DEBUG("XSDRSIZE %d", xsdrsize);
- if( dr_out_buf ) free(dr_out_buf);
- if( dr_in_buf) free(dr_in_buf);
- if( dr_in_mask) free(dr_in_mask);
+ if (dr_out_buf) free(dr_out_buf);
+ if (dr_in_buf) free(dr_in_buf);
+ if (dr_in_mask) free(dr_in_mask);
dr_out_buf = malloc((xsdrsize + 7) / 8);
dr_in_buf = malloc((xsdrsize + 7) / 8);
if (opcode == XSDRTDO)
{
- if(xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_buf) != ERROR_OK )
+ if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_buf) != ERROR_OK)
{
do_abort = 1;
break;
LOG_DEBUG("%s %d", op_name, xsdrsize);
- for( attempt=0; attempt<limit; ++attempt )
+ for (attempt = 0; attempt < limit; ++attempt)
{
scan_field_t field;
- if( attempt>0 )
+ if (attempt > 0)
{
/* perform the XC9500 exception handling sequence shown in xapp067.pdf and
illustrated in psuedo code at end of this file. We start from state
TAP_IDLE,
};
- jtag_add_pathmove( DIM(exception_path), exception_path );
+ jtag_add_pathmove(DIM(exception_path), exception_path);
if (verbose)
LOG_USER("%s mismatch, xsdrsize=%d retry=%d", op_name, xsdrsize, attempt);
field.in_value = calloc(CEIL(field.num_bits, 8), 1);
if (tap == NULL)
- jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+ jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
else
- jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+ jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
if (!matched)
{
- LOG_USER( "%s mismatch", op_name);
+ LOG_USER("%s mismatch", op_name);
tdo_mismatch = 1;
break;
}
case XSTATE:
{
tap_state_t mystate;
- u8 uc;
+ uint8_t uc;
if (read(xsvf_fd, &uc, 1) < 0)
{
mystate = xsvf_to_tap(uc);
- LOG_DEBUG("XSTATE 0x%02X %s", uc, tap_state_name(mystate) );
+ LOG_DEBUG("XSTATE 0x%02X %s", uc, tap_state_name(mystate));
/* there is no need for the lookahead code that was here since we
queue up the jtag commands anyway. This is a simple way to handle
the XSTATE.
*/
- if( jtag_add_statemove( mystate ) != ERROR_OK )
+ if (jtag_add_statemove(mystate) != ERROR_OK)
{
/* For special states known as stable states
(Test-Logic-Reset, Run-Test/Idle, Pause-DR, Pause- IR),
LOG_ERROR("XSTATE %s is not reachable from current state %s in one clock cycle",
tap_state_name(mystate),
tap_state_name(cmd_queue_cur_state)
- );
+);
}
}
break;
}
/* see page 22 of XSVF spec */
- if( uc == 0 )
+ if (uc == 0)
xendir = TAP_IDLE;
- else if( uc == 1 )
+ else if (uc == 1)
xendir = TAP_IRPAUSE;
else
{
}
/* see page 22 of XSVF spec */
- if( uc == 0 )
+ if (uc == 0)
xenddr = TAP_IDLE;
- else if( uc == 1 )
+ else if (uc == 1)
xenddr = TAP_DRPAUSE;
else
{
case XSIR:
case XSIR2:
{
- u8 short_buf[2];
- u8* ir_buf;
+ uint8_t short_buf[2];
+ uint8_t* ir_buf;
int bitcount;
tap_state_t my_end_state = xruntest ? TAP_IDLE : xendir;
- if( opcode == XSIR )
+ if (opcode == XSIR)
{
/* one byte bitcount */
if (read(xsvf_fd, short_buf, 1) < 0)
LOG_DEBUG("XSIR2 %d", bitcount);
}
- ir_buf = malloc((bitcount+7) / 8);
+ ir_buf = malloc((bitcount + 7) / 8);
if (xsvf_read_buffer(bitcount, xsvf_fd, ir_buf) != ERROR_OK)
do_abort = 1;
field.in_value = NULL;
-
+
if (tap == NULL)
jtag_add_plain_ir_scan(1, &field, my_end_state);
/* LOG_DEBUG("FLUSHING QUEUE"); */
result = jtag_execute_queue();
- if(result != ERROR_OK)
+ if (result != ERROR_OK)
{
tdo_mismatch = 1;
}
break;
}
- if ( ndx < sizeof(comment)-1 )
+ if (ndx < sizeof(comment)-1)
comment[ndx++] = uc;
} while (uc != 0);
case XWAIT:
{
/* expected in stream:
- XWAIT <u8 wait_state> <u8 end_state> <u32 usecs>
+ XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
*/
- u8 wait;
- u8 end;
- u8 delay_buf[4];
+ uint8_t wait;
+ uint8_t end;
+ uint8_t delay_buf[4];
tap_state_t wait_state;
tap_state_t end_state;
int delay;
- if ( read(xsvf_fd, &wait, 1) < 0
+ if (read(xsvf_fd, &wait, 1) < 0
|| read(xsvf_fd, &end, 1) < 0
|| read(xsvf_fd, delay_buf, 4) < 0)
{
LOG_DEBUG("XWAIT %s %s usecs:%d", tap_state_name(wait_state), tap_state_name(end_state), delay);
- if (runtest_requires_tck && wait_state == TAP_IDLE )
+ if (runtest_requires_tck && wait_state == TAP_IDLE)
{
jtag_add_runtest(delay, end_state);
}
else
{
- jtag_add_statemove( wait_state );
+ jtag_add_statemove(wait_state);
jtag_add_sleep(delay);
- jtag_add_statemove( end_state );
+ jtag_add_statemove(end_state);
}
}
break;
case XWAITSTATE:
{
/* expected in stream:
- XWAITSTATE <u8 wait_state> <u8 end_state> <u32 clock_count> <u32 usecs>
+ XWAITSTATE <uint8_t wait_state> <uint8_t end_state> <uint32_t clock_count> <uint32_t usecs>
*/
- u8 clock_buf[4];
- u8 usecs_buf[4];
- u8 wait;
- u8 end;
+ uint8_t clock_buf[4];
+ uint8_t usecs_buf[4];
+ uint8_t wait;
+ 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, 1) < 0
|| read(xsvf_fd, &end, 1) < 0
|| read(xsvf_fd, clock_buf, 4) < 0
- || read(xsvf_fd, usecs_buf, 4) < 0 )
+ || read(xsvf_fd, usecs_buf, 4) < 0)
{
do_abort = 1;
break;
}
- wait_state = xsvf_to_tap( wait );
- end_state = xsvf_to_tap( end );
+ wait_state = xsvf_to_tap(wait);
+ end_state = xsvf_to_tap(end);
clock_count = be_to_h_u32(clock_buf);
usecs = be_to_h_u32(usecs_buf);
*/
if (wait_state != TAP_IRPAUSE && wait_state != TAP_DRPAUSE && wait_state != TAP_RESET && wait_state != TAP_IDLE)
{
- LOG_ERROR("illegal XWAITSTATE wait_state: \"%s\"", tap_state_name( wait_state ));
+ LOG_ERROR("illegal XWAITSTATE wait_state: \"%s\"", tap_state_name(wait_state));
unsupported = 1;
}
- jtag_add_statemove( wait_state );
+ jtag_add_statemove(wait_state);
- jtag_add_clocks( clock_count );
+ jtag_add_clocks(clock_count);
- jtag_add_sleep( usecs );
+ jtag_add_sleep(usecs);
- jtag_add_statemove( end_state );
+ jtag_add_statemove(end_state);
}
break;
case LCOUNT:
{
/* expected in stream:
- LCOUNT <u32 loop_count>
+ LCOUNT <uint32_t loop_count>
*/
- u8 count_buf[4];
+ uint8_t count_buf[4];
- if ( read(xsvf_fd, count_buf, 4) < 0 )
+ if (read(xsvf_fd, count_buf, 4) < 0)
{
do_abort = 1;
break;
case LDELAY:
{
/* expected in stream:
- LDELAY <u8 wait_state> <u32 clock_count> <u32 usecs_to_sleep>
+ LDELAY <uint8_t wait_state> <uint32_t clock_count> <uint32_t usecs_to_sleep>
*/
- u8 state;
- u8 clock_buf[4];
- u8 usecs_buf[4];
+ uint8_t state;
+ uint8_t clock_buf[4];
+ uint8_t usecs_buf[4];
- if ( read(xsvf_fd, &state, 1) < 0
+ if (read(xsvf_fd, &state, 1) < 0
|| read(xsvf_fd, clock_buf, 4) < 0
- || read(xsvf_fd, usecs_buf, 4) < 0 )
+ || read(xsvf_fd, usecs_buf, 4) < 0)
{
do_abort = 1;
break;
LOG_DEBUG("LSDR");
- if ( xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK
- || xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_buf) != ERROR_OK )
+ if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_out_buf) != ERROR_OK
+ || xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_buf) != ERROR_OK)
{
do_abort = 1;
break;
if (limit < 1)
limit = 1;
- for( attempt=0; attempt<limit; ++attempt )
+ for (attempt = 0; attempt < limit; ++attempt)
{
scan_field_t field;
- jtag_add_statemove( loop_state );
+ jtag_add_statemove(loop_state);
jtag_add_clocks(loop_clocks);
jtag_add_sleep(loop_usecs);
LOG_USER("LSDR retry %d", attempt);
if (tap == NULL)
- jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+ jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
else
- jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+ jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
/* LOG_DEBUG("FLUSHING QUEUE"); */
result = jtag_execute_queue();
- if(result == ERROR_OK)
+ if (result == ERROR_OK)
{
matched = 1;
break;
}
}
- if (!matched )
+ if (!matched)
{
- LOG_USER( "LSDR mismatch" );
+ LOG_USER("LSDR mismatch");
tdo_mismatch = 1;
break;
}
case XTRST:
{
- u8 trst_mode;
+ uint8_t trst_mode;
if (read(xsvf_fd, &trst_mode, 1) < 0)
{
break;
}
- switch( trst_mode )
+ switch (trst_mode)
{
case XTRST_ON:
jtag_add_reset(1, 0);
case XTRST_ABSENT:
break;
default:
- LOG_ERROR( "XTRST mode argument (0x%02X) out of range", trst_mode );
+ LOG_ERROR("XTRST mode argument (0x%02X) out of range", trst_mode);
do_abort = 1;
}
}
LOG_DEBUG("xsvf failed, setting taps to reasonable state");
/* upon error, return the TAPs to a reasonable state */
- jtag_add_statemove( TAP_IDLE );
+ jtag_add_statemove(TAP_IDLE);
jtag_execute_queue();
break;
}
if (tdo_mismatch)
{
command_print(cmd_ctx, "TDO mismatch, somewhere near offset %lu in xsvf file, aborting",
- file_offset );
+ file_offset);
return ERROR_FAIL;