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] );
+ tap = jtag_tap_by_string( args[0] );
if (!tap )
{
command_print( cmd_ctx, "Tap: %s unknown", args[0] );
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;
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;
{
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
field.in_value = calloc(CEIL(field.num_bits, 8), 1);
if (tap == NULL)
- jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+ jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
else
- jtag_add_dr_scan(1, &field, jtag_add_end_state(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);
case XSTATE:
{
tap_state_t mystate;
- u8 uc;
+ uint8_t uc;
if (read(xsvf_fd, &uc, 1) < 0)
{
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),
}
/* 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("FLUSHING QUEUE"); */
result = jtag_execute_queue();
- if(result != ERROR_OK)
+ if (result != ERROR_OK)
{
tdo_mismatch = 1;
}
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;
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;
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 )
{
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
|| read(xsvf_fd, clock_buf, 4) < 0
LOG_USER("LSDR retry %d", attempt);
if (tap == NULL)
- jtag_add_plain_dr_scan(1, &field, jtag_add_end_state(TAP_DRPAUSE));
+ jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
else
- jtag_add_dr_scan(1, &field, jtag_add_end_state(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;
case XTRST:
{
- u8 trst_mode;
+ uint8_t trst_mode;
if (read(xsvf_fd, &trst_mode, 1) < 0)
{
projects / fw / openocd / blobdiff