/***************************************************************************
- * Copyright (C) 2007 by Simon Qian <SimonQian@SimonQian.com> *
+ * Copyright (C) 2009 by Simon Qian <SimonQian@SimonQian.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
#endif
#ifdef _DEBUG_JTAG_IO_
-#define DEBUG_JTAG_IO(expr ...) LOG_DEBUG(expr)
+#define DEBUG_JTAG_IO(expr ...) LOG_DEBUG(expr)
#else
#define DEBUG_JTAG_IO(expr ...)
#endif
-#define VID 0x03EB
-#define PID 0x2103
-#define VSLLINK_WRITE_ENDPOINT 0x02
-#define VSLLINK_READ_ENDPOINT 0x82
+u16 vsllink_vid;
+u16 vsllink_pid;
+u8 vsllink_bulkout;
+u8 vsllink_bulkin;
-u16 vsllink_vid = VID;
-u16 vsllink_pid = PID;
-u8 vsllink_bulkout = VSLLINK_WRITE_ENDPOINT;
-u8 vsllink_bulkin = VSLLINK_READ_ENDPOINT;
-
-#define VSLLINK_USB_TIMEOUT 1000
+#define VSLLINK_USB_TIMEOUT 10000
static int VSLLINK_BufferSize = 1024;
#define VSLLINK_CMD_GET_PORT 0x91
#define VSLLINK_CMD_SET_PORTDIR 0x92
#define VSLLINK_CMD_HW_JTAGSEQCMD 0xA0
+#define VSLLINK_CMD_HW_JTAGHLCMD 0xA1
+#define VSLLINK_CMD_HW_SWDCMD 0xA2
#define VSLLINK_CMDJTAGSEQ_TMSBYTE 0x00
+#define VSLLINK_CMDJTAGSEQ_TMSCLOCK 0x40
#define VSLLINK_CMDJTAGSEQ_SCAN 0x80
#define VSLLINK_CMDJTAGSEQ_CMDMSK 0xC0
#define JTAG_PINMSK_TDO (1 << 7)
-#define VSLLINK_TAP_MOVE(from, to) VSLLINK_tap_move[tap_move_map[from]][tap_move_map[to]]
+#define VSLLINK_TAP_MOVE(from, to) VSLLINK_tap_move[tap_move_ndx(from)][tap_move_ndx(to)]
/* VSLLINK_tap_move[i][j]: tap movement command to go from state i to state j
* 0: Test-Logic-Reset
* 3: Pause-DR
* 4: Shift-IR
* 5: Pause-IR
- *
+ *
* SD->SD and SI->SI have to be caught in interface specific code
*/
u8 VSLLINK_tap_move[6][6] =
{
/* TLR RTI SD PD SI PI */
- {0xff, 0x00, 0x2f, 0x0a, 0x37, 0x16}, /* TLR */
+ {0xff, 0x7f, 0x2f, 0x0a, 0x37, 0x16}, /* TLR */
{0xff, 0x00, 0x45, 0x05, 0x4b, 0x0b}, /* RTI */
{0xff, 0x61, 0x00, 0x01, 0x0f, 0x2f}, /* SD */
- {0xff, 0x60, 0x40, 0x17, 0x3c, 0x2f}, /* PD */
+ {0xff, 0x60, 0x40, 0x5c, 0x3c, 0x5e}, /* PD */
{0xff, 0x61, 0x07, 0x17, 0x00, 0x01}, /* SI */
- {0xff, 0x60, 0x38, 0x17, 0x40, 0x2f} /* PI */
+ {0xff, 0x60, 0x38, 0x5c, 0x40, 0x5e} /* PI */
};
-u8 VSLLINK_TAP_MOVE_FROM_E1[6] =
+typedef struct insert_insignificant_operation
{
-// TLR RTI SD PD SI PI
- 0xff, 0x60, 0x38, 0x5c, 0x3c, 0x5E
-};
+ unsigned char insert_value;
+ unsigned char insert_position;
+}insert_insignificant_operation_t;
-u8 VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[7][6][2] =
+insert_insignificant_operation_t VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[6][6] =
{
/* stuff offset */
{/* TLR */
0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f
};
+typedef struct
+{
+ int length; /* Number of bits to read */
+ int offset;
+ scan_command_t *command; /* Corresponding scan command */
+ u8 *buffer;
+} pending_scan_result_t;
+
+#define MAX_PENDING_SCAN_RESULTS 256
+
+static int pending_scan_results_length;
+static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
+
/* External interface functions */
int vsllink_execute_queue(void);
int vsllink_speed(int speed);
int vsllink_handle_usb_bulkout_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
/* Queue command functions */
-void vsllink_end_state(enum tap_state state);
+void vsllink_end_state(tap_state_t state);
void vsllink_state_move(void);
-void vsllink_path_move(int num_states, enum tap_state *path);
+void vsllink_path_move(int num_states, tap_state_t *path);
void vsllink_runtest(int num_cycles);
+void vsllink_stableclocks(int num_cycles, int tms);
void vsllink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
void vsllink_reset(int trst, int srst);
void vsllink_simple_command(u8 command);
void vsllink_debug_buffer(u8 *buffer, int length);
-int vsllink_tms_data_len = 0;
-u8* vsllink_tms_cmd_pos;
+static int vsllink_tms_data_len = 0;
+static u8* vsllink_tms_cmd_pos;
vsllink_jtag_t* vsllink_jtag_handle;
enum scan_type type;
u8 *buffer;
- DEBUG_JTAG_IO("--------------------------------------------------------------------------------");
+ DEBUG_JTAG_IO("--------------------------------- vsllink -------------------------------------");
vsllink_usb_out_buffer[0] = VSLLINK_CMD_HW_JTAGSEQCMD;
vsllink_usb_out_buffer_idx = 3;
switch (cmd->type)
{
case JTAG_END_STATE:
- DEBUG_JTAG_IO("end_state: %i", cmd->cmd.end_state->end_state);
-
- if (cmd->cmd.end_state->end_state != -1)
+ DEBUG_JTAG_IO("end_state: %s", tap_state_name(cmd->cmd.end_state->end_state));
+
+ if (cmd->cmd.end_state->end_state != TAP_INVALID)
{
vsllink_end_state(cmd->cmd.end_state->end_state);
}
break;
-
+
case JTAG_RUNTEST:
- DEBUG_JTAG_IO( "runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
- cmd->cmd.runtest->end_state);
-
- if (cmd->cmd.runtest->end_state != -1)
+ DEBUG_JTAG_IO( "runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, \
+ tap_state_name(cmd->cmd.runtest->end_state));
+
+ if (cmd->cmd.runtest->end_state != TAP_INVALID)
{
vsllink_end_state(cmd->cmd.runtest->end_state);
}
vsllink_runtest(cmd->cmd.runtest->num_cycles);
break;
-
+
case JTAG_STATEMOVE:
- DEBUG_JTAG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
-
- if (cmd->cmd.statemove->end_state != -1)
+ DEBUG_JTAG_IO("statemove end in %s", tap_state_name(cmd->cmd.statemove->end_state));
+
+ if (cmd->cmd.statemove->end_state != TAP_INVALID)
{
vsllink_end_state(cmd->cmd.statemove->end_state);
}
vsllink_state_move();
break;
-
+
case JTAG_PATHMOVE:
- DEBUG_JTAG_IO("pathmove: %i states, end in %i", \
+ DEBUG_JTAG_IO("pathmove: %i states, end in %s", \
cmd->cmd.pathmove->num_states, \
- cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
-
+ tap_state_name(cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]));
+
vsllink_path_move(cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path);
break;
-
+
case JTAG_SCAN:
- if (cmd->cmd.scan->end_state != -1)
+ if (cmd->cmd.scan->end_state != TAP_INVALID)
{
vsllink_end_state(cmd->cmd.scan->end_state);
}
-
+
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
if (cmd->cmd.scan->ir_scan)
{
- DEBUG_JTAG_IO("JTAG Scan write IR(%d bits), end in %d:", scan_size, cmd->cmd.scan->end_state);
+ DEBUG_JTAG_IO("JTAG Scan write IR(%d bits), end in %s:", scan_size, tap_state_name(cmd->cmd.scan->end_state));
}
else
{
- DEBUG_JTAG_IO("JTAG Scan write DR(%d bits), end in %d:", scan_size, cmd->cmd.scan->end_state);
+ DEBUG_JTAG_IO("JTAG Scan write DR(%d bits), end in %s:", scan_size, tap_state_name(cmd->cmd.scan->end_state));
}
#ifdef _DEBUG_JTAG_IO_
vsllink_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size, cmd->cmd.scan);
break;
-
+
case JTAG_RESET:
DEBUG_JTAG_IO("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
vsllink_tap_execute();
-
+
if (cmd->cmd.reset->trst == 1)
{
- cur_state = TAP_RESET;
+ tap_set_state(TAP_RESET);
}
vsllink_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
vsllink_usb_out_buffer[0] = VSLLINK_CMD_HW_JTAGSEQCMD;
vsllink_usb_out_buffer_idx = 3;
break;
-
+
case JTAG_SLEEP:
DEBUG_JTAG_IO("sleep %i", cmd->cmd.sleep->us);
vsllink_tap_execute();
jtag_sleep(cmd->cmd.sleep->us);
break;
-
+
+ case JTAG_STABLECLOCKS:
+ DEBUG_JTAG_IO("add %d clocks", cmd->cmd.stableclocks->num_cycles);
+ switch(tap_get_state())
+ {
+ case TAP_RESET:
+ // tms should be '1' to stay in TAP_RESET mode
+ scan_size = 1;
+ break;
+ case TAP_DRSHIFT:
+ case TAP_IDLE:
+ case TAP_DRPAUSE:
+ case TAP_IRSHIFT:
+ case TAP_IRPAUSE:
+ // in other mode, tms should be '0'
+ scan_size = 0;
+ break; /* above stable states are OK */
+ default:
+ LOG_ERROR( "jtag_add_clocks() was called with TAP in non-stable state \"%s\"",
+ tap_state_name(tap_get_state()) );
+ exit(-1);
+ }
+ vsllink_stableclocks(cmd->cmd.stableclocks->num_cycles, scan_size);
+ break;
+
default:
- LOG_ERROR("BUG: unknown JTAG command type encountered");
+ LOG_ERROR("BUG: unknown JTAG command type encountered: %d", cmd->type);
exit(-1);
}
cmd = cmd->next;
}
-
+
return vsllink_tap_execute();
}
vsllink_usb_out_buffer[0] = VSLLINK_CMD_SET_SPEED;
vsllink_usb_out_buffer[1] = (speed >> 0) & 0xff;
vsllink_usb_out_buffer[2] = (speed >> 8) & 0xFF;
-
+
result = vsllink_usb_write(vsllink_jtag_handle, 3);
-
+
if (result == 3)
{
return ERROR_OK;
LOG_ERROR("VSLLink setting speed failed (%d)", result);
return ERROR_JTAG_DEVICE_ERROR;
}
-
+
return ERROR_OK;
}
int vsllink_khz(int khz, int *jtag_speed)
{
*jtag_speed = khz;
-
+
return ERROR_OK;
}
int vsllink_register_commands(struct command_context_s *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "vsllink_usb_vid", vsllink_handle_usb_vid_command,
+ register_command(cmd_ctx, NULL, "vsllink_usb_vid", vsllink_handle_usb_vid_command,
COMMAND_CONFIG, NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_pid", vsllink_handle_usb_pid_command,
+ register_command(cmd_ctx, NULL, "vsllink_usb_pid", vsllink_handle_usb_pid_command,
COMMAND_CONFIG, NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_bulkin", vsllink_handle_usb_bulkin_command,
+ register_command(cmd_ctx, NULL, "vsllink_usb_bulkin", vsllink_handle_usb_bulkin_command,
COMMAND_CONFIG, NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_bulkout", vsllink_handle_usb_bulkout_command,
+ register_command(cmd_ctx, NULL, "vsllink_usb_bulkout", vsllink_handle_usb_bulkout_command,
COMMAND_CONFIG, NULL);
return ERROR_OK;
int vsllink_init(void)
{
- int check_cnt;
+ int check_cnt;
int result;
char version_str[100];
}
vsllink_jtag_handle = vsllink_usb_open();
-
+
if (vsllink_jtag_handle == 0)
{
LOG_ERROR("Can't find USB JTAG Interface! Please check connection and permissions.");
return ERROR_JTAG_INIT_FAILED;
}
-
+
check_cnt = 0;
while (check_cnt < 3)
{
vsllink_usb_out_buffer[0] = VSLLINK_CMD_SET_PORTDIR;
vsllink_usb_out_buffer[1] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST | JTAG_PINMSK_USR1 | JTAG_PINMSK_USR2;
vsllink_usb_out_buffer[2] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST;
- result = vsllink_usb_write(vsllink_jtag_handle, 3);
- if (result != 3)
+ if (vsllink_usb_write(vsllink_jtag_handle, 3) != 3)
{
LOG_ERROR("VSLLink USB send data error");
exit(-1);
LOG_INFO("VSLLink JTAG Interface ready");
vsllink_tap_init();
-
+
return ERROR_OK;
}
{
if ((vsllink_usb_in_buffer != NULL) && (vsllink_usb_out_buffer != NULL))
{
+ // Set all pins to input
+ vsllink_usb_out_buffer[0] = VSLLINK_CMD_SET_PORTDIR;
+ vsllink_usb_out_buffer[1] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST | JTAG_PINMSK_USR1 | JTAG_PINMSK_USR2;
+ vsllink_usb_out_buffer[2] = 0;
+ if (vsllink_usb_write(vsllink_jtag_handle, 3) != 3)
+ {
+ LOG_ERROR("VSLLink USB send data error");
+ exit(-1);
+ }
+
+ // disconnect
vsllink_simple_command(VSLLINK_CMD_DISCONN);
vsllink_usb_close(vsllink_jtag_handle);
}
}
// when vsllink_tms_data_len > 0, vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] is the byte that need to be appended.
-// length of VSLLINK_CMDJTAGSEQ_TMSBYTE has been set.
-void VSLLINK_add_tms_from_RTI(enum tap_state state)
+// length of VSLLINK_CMDJTAGSEQ_TMSBYTE has been set, no need to set it here.
+void vsllink_append_tms(void)
{
- u8 tms_scan = VSLLINK_TAP_MOVE(TAP_IDLE, state);
+ u8 tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state());
u16 tms2;
+ tap_state_t end_state = tap_get_end_state();
- if ((cur_state != TAP_IDLE) || (state == TAP_IDLE) || (vsllink_tms_data_len <= 0) || (vsllink_tms_data_len >= 8) || (vsllink_tms_cmd_pos == NULL))
+ if (((tap_get_state() != TAP_RESET) && (tap_get_state() != TAP_IDLE) && (tap_get_state() != TAP_DRPAUSE) && (tap_get_state() != TAP_IRPAUSE)) || \
+ (vsllink_tms_data_len <= 0) || (vsllink_tms_data_len >= 8) || \
+ (vsllink_tms_cmd_pos == NULL))
{
LOG_ERROR("There MUST be some bugs in the driver");
exit(-1);
}
- tms2 = (tms_scan & VSLLINK_BIT_MSK[VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[1][tap_move_map[state]][1]]) << vsllink_tms_data_len;
- if (VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[1][tap_move_map[state]][0] == 1)
+ tms2 = (tms_scan & VSLLINK_BIT_MSK[VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(end_state)].insert_position]) << \
+ vsllink_tms_data_len;
+ if (VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(end_state)].insert_value == 1)
{
- tms2 |= VSLLINK_BIT_MSK[8 - vsllink_tms_data_len] << (vsllink_tms_data_len + VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[1][tap_move_map[state]][1]);
+ tms2 |= VSLLINK_BIT_MSK[8 - vsllink_tms_data_len] << \
+ (vsllink_tms_data_len + VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(end_state)].insert_position);
}
- tms2 |= (tms_scan >> VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[1][tap_move_map[state]][1]) << (8 + VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[1][tap_move_map[state]][1]);
+ tms2 |= (tms_scan >> VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(end_state)].insert_position) << \
+ (8 + VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(end_state)].insert_position);
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (tms2 >> 0) & 0xff;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (tms2 >> 8) & 0xff;
/***************************************************************************/
/* Queue command implementations */
-void vsllink_end_state(enum tap_state state)
+void vsllink_end_state(tap_state_t state)
{
- if (tap_move_map[state] != -1)
+ if (tap_is_state_stable(state))
{
- end_state = state;
+ tap_set_end_state(state);
}
else
{
{
if (vsllink_tms_data_len > 0)
{
- VSLLINK_add_tms_from_RTI(end_state);
+ vsllink_append_tms();
}
else
{
vsllink_tap_ensure_space(0, 2);
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE;
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(cur_state, end_state);
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state());
}
- cur_state = end_state;
+ tap_set_state(tap_get_end_state());
}
// write tms from current vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx]
-void vsllink_add_path(int start, int num, enum tap_state *path)
+void vsllink_add_path(int start, int num, tap_state_t *path)
{
int i;
{
if (i > 0)
{
- vsllink_usb_out_buffer[++vsllink_usb_out_buffer_idx] = 0;
- }
- else
- {
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = 0;
+ vsllink_usb_out_buffer_idx++;
}
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = 0;
}
- if (path[i - start] == tap_transitions[cur_state].high)
+ if (path[i - start] == tap_state_transition(tap_get_state(), true))
{
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] |= 1 << (i & 7);
}
+ else if (path[i - start] == tap_state_transition(tap_get_state(), false))
+ {
+ // nothing to do
+ }
else
{
- LOG_ERROR("BUG: %d -> %d isn't a valid TAP transition", cur_state, path[i]);
+ LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_name(tap_get_state()), tap_state_name(path[i]));
exit(-1);
}
-
- cur_state = path[i];
+ tap_set_state(path[i - start]);
}
- end_state = cur_state;
+ if ((i > 0) && ((i & 7) == 0))
+ {
+ vsllink_usb_out_buffer_idx++;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = 0;
+ }
+
+ tap_set_end_state(tap_get_state());
}
-void vsllink_path_move(int num_states, enum tap_state *path)
+void vsllink_path_move(int num_states, tap_state_t *path)
{
int i, tms_len, tms_cmd_pos, path_idx = 0;
if (vsllink_tms_data_len > 0)
{
- if ((vsllink_tms_data_len + num_states) < 8)
- {
- vsllink_add_path(vsllink_tms_data_len, num_states, path);
- num_states = 0;
- }
- else if ((vsllink_tms_data_len + num_states) < 16)
+ // there are vsllink_tms_data_len more tms bits to be shifted
+ // so there are vsllink_tms_data_len + num_states tms bits in all
+ tms_len = vsllink_tms_data_len + num_states;
+ if (tms_len <= 16)
{
- if ((*vsllink_tms_cmd_pos & VSLLINK_CMDJTAGSEQ_LENMSK) \
- < VSLLINK_CMDJTAGSEQ_LENMSK)
+ // merge into last tms shift
+ if (tms_len < 8)
{
- *vsllink_tms_cmd_pos++;
+ // just append tms data to the last tms byte
vsllink_add_path(vsllink_tms_data_len, num_states, path);
}
- else
+ else if (tms_len == 8)
{
- // need a new VSLLINK_CMDJTAGSEQ_TMSBYTE command
- // if vsllink_tms_data_len > 0, length of VSLLINK_CMDJTAGSEQ_TMSBYTE MUST be > 1(tms_len > 2)
- *vsllink_tms_cmd_pos--;
- vsllink_add_path(vsllink_tms_data_len, 8 - vsllink_tms_data_len, path);
- vsllink_usb_out_buffer_idx++;
- vsllink_tap_ensure_space(0, 3);
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | 1;
- vsllink_tms_cmd_pos = vsllink_usb_out_buffer + vsllink_usb_out_buffer_idx;
- vsllink_add_path(vsllink_tms_data_len, num_states + vsllink_tms_data_len - 8, path + 8 - vsllink_tms_data_len);
+ // end last tms shift command
+ (*vsllink_tms_cmd_pos)--;
+ vsllink_add_path(vsllink_tms_data_len, num_states, path);
}
+ else if (tms_len < 16)
+ {
+ if ((*vsllink_tms_cmd_pos & VSLLINK_CMDJTAGSEQ_LENMSK) < VSLLINK_CMDJTAGSEQ_LENMSK)
+ {
+ // every tms shift command can contain VSLLINK_CMDJTAGSEQ_LENMSK + 1 bytes in most
+ // there is enought tms length in the current tms shift command
+ (*vsllink_tms_cmd_pos)++;
+ vsllink_add_path(vsllink_tms_data_len, num_states, path);
+ }
+ else
+ {
+ // every tms shift command can contain VSLLINK_CMDJTAGSEQ_LENMSK + 1 bytes in most
+ // not enough tms length in the current tms shift command
+ // so a new command should be added
+ // first decrease byte length of last tms shift command
+ (*vsllink_tms_cmd_pos)--;
+ // append tms data to the last tms byte
+ vsllink_add_path(vsllink_tms_data_len, 8 - vsllink_tms_data_len, path);
+ path += 8 - vsllink_tms_data_len;
+ // add new command(3 bytes)
+ vsllink_tap_ensure_space(0, 3);
+ vsllink_tms_cmd_pos = &vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | 1;
+ vsllink_add_path(0, num_states - (8 - vsllink_tms_data_len), path);
+ }
+ }
+ else if (tms_len == 16)
+ {
+ // end last tms shift command
+ vsllink_add_path(vsllink_tms_data_len, num_states, path);
+ }
+
vsllink_tms_data_len = (vsllink_tms_data_len + num_states) & 7;
+ if (vsllink_tms_data_len == 0)
+ {
+ vsllink_tms_cmd_pos = NULL;
+ }
num_states = 0;
}
else
{
vsllink_add_path(vsllink_tms_data_len, 16 - vsllink_tms_data_len, path);
- path_idx = 16 - vsllink_tms_data_len;
- vsllink_usb_out_buffer_idx++;
- num_states -= 16 - vsllink_tms_data_len;
path += 16 - vsllink_tms_data_len;
+ num_states -= 16 - vsllink_tms_data_len;
vsllink_tms_data_len = 0;
vsllink_tms_cmd_pos = NULL;
}
{
if (tms_len < (VSLLINK_CMDJTAGSEQ_LENMSK + 1))
{
- vsllink_usb_out_buffer[tms_cmd_pos]++;
- vsllink_usb_out_buffer = vsllink_usb_out_buffer + tms_cmd_pos;
+ vsllink_tms_cmd_pos = &vsllink_usb_out_buffer[tms_cmd_pos];
+ (*vsllink_tms_cmd_pos)++;
}
else
{
vsllink_usb_out_buffer[tms_cmd_pos]--;
+
tms_len = vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
vsllink_tap_ensure_space(0, 3);
+ vsllink_tms_cmd_pos = &vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | 1;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = tms_len;
}
}
}
-void vsllink_runtest(int num_cycles)
+void vsllink_stableclocks(int num_cycles, int tms)
{
- int i = 0, j;
- int tms_len, first_tms = 0, tms_cmd_pos = 0;
- enum tap_state saved_end_state = end_state;
+ int tms_len;
+ u16 tms_append_byte;
- if (cur_state != TAP_IDLE)
+ if (vsllink_tms_data_len > 0)
{
- vsllink_end_state(TAP_IDLE);
-
- if (vsllink_tms_data_len > 0)
+ // there are vsllink_tms_data_len more tms bits to be shifted
+ // so there are vsllink_tms_data_len + num_cycles tms bits in all
+ tms_len = vsllink_tms_data_len + num_cycles;
+ if (tms > 0)
{
- VSLLINK_add_tms_from_RTI(end_state);
+ // append '1' for tms
+ tms_append_byte = (u16)((((1 << num_cycles) - 1) << vsllink_tms_data_len) & 0xFFFF);
}
else
{
- first_tms = 1;
+ // append '0' for tms
+ tms_append_byte = 0;
}
- }
-
- if (vsllink_tms_data_len > 0)
- {
- // cur_state == TAP_IDLE
- if ((vsllink_tms_data_len + num_cycles) < 8)
- {
- vsllink_tms_data_len += num_cycles;
- num_cycles = 0;
- }
- else if ((vsllink_tms_data_len + num_cycles) < 16)
+ if (tms_len <= 16)
{
- if ((*vsllink_tms_cmd_pos & VSLLINK_CMDJTAGSEQ_LENMSK) \
- < VSLLINK_CMDJTAGSEQ_LENMSK)
+ // merge into last tms shift
+ if (tms_len < 8)
{
- *vsllink_tms_cmd_pos++;
- vsllink_usb_out_buffer[++vsllink_usb_out_buffer_idx] = 0;
+ // just add to vsllink_tms_data_len
+ // same result if tun through
+ //vsllink_tms_data_len += num_cycles;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] |= (u8)(tms_append_byte & 0xFF);
}
- else
+ else if (tms_len == 8)
{
- // need a new VSLLINK_CMDJTAGSEQ_TMSBYTE command
- // if vsllink_tms_data_len > 0, length of VSLLINK_CMDJTAGSEQ_TMSBYTE MUST be > 1(tms_len > 2)
- *vsllink_tms_cmd_pos--;
- vsllink_tap_ensure_space(0, 3);
- vsllink_usb_out_buffer[++vsllink_usb_out_buffer_idx] = VSLLINK_CMDJTAGSEQ_TMSBYTE | 1;
- vsllink_tms_cmd_pos = vsllink_usb_out_buffer + vsllink_usb_out_buffer_idx;
- vsllink_usb_out_buffer[++vsllink_usb_out_buffer_idx] = 0;
+ // end last tms shift command
+ // just reduce it, and append last tms byte
+ (*vsllink_tms_cmd_pos)--;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (u8)(tms_append_byte & 0xFF);
+ }
+ else if (tms_len < 16)
+ {
+ if ((*vsllink_tms_cmd_pos & VSLLINK_CMDJTAGSEQ_LENMSK) < VSLLINK_CMDJTAGSEQ_LENMSK)
+ {
+ // every tms shift command can contain VSLLINK_CMDJTAGSEQ_LENMSK + 1 bytes in most
+ // there is enought tms length in the current tms shift command
+ // increase the tms byte length by 1 and set the last byte to 0
+ (*vsllink_tms_cmd_pos)++;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (u8)(tms_append_byte & 0xFF);
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = (u8)(tms_append_byte >> 8);
+ }
+ else
+ {
+ // every tms shift command can contain VSLLINK_CMDJTAGSEQ_LENMSK + 1 bytes in most
+ // not enough tms length in the current tms shift command
+ // so a new command should be added
+ // first decrease byte length of last tms shift command
+ (*vsllink_tms_cmd_pos)--;
+ // append last tms byte and move the command pointer to the next empty position
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (u8)(tms_append_byte & 0xFF);
+ // add new command(3 bytes)
+ vsllink_tap_ensure_space(0, 3);
+ vsllink_tms_cmd_pos = &vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | 1;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = (u8)(tms_append_byte >> 8);
+ }
+ }
+ else if (tms_len == 16)
+ {
+ // end last tms shift command
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (u8)(tms_append_byte & 0xFF);
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (u8)(tms_append_byte >> 8);
+ }
+
+ vsllink_tms_data_len = tms_len & 7;
+ if (vsllink_tms_data_len == 0)
+ {
+ vsllink_tms_cmd_pos = NULL;
}
- vsllink_tms_data_len = (vsllink_tms_data_len + num_cycles) & 7;
num_cycles = 0;
}
else
{
- vsllink_usb_out_buffer[++vsllink_usb_out_buffer_idx] = 0;
- vsllink_usb_out_buffer_idx++;
+ // more shifts will be needed
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (u8)(tms_append_byte & 0xFF);
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (u8)(tms_append_byte >> 8);
num_cycles -= 16 - vsllink_tms_data_len;
vsllink_tms_data_len = 0;
vsllink_tms_cmd_pos = NULL;
}
}
+ // from here vsllink_tms_data_len == 0 or num_cycles == 0
- tms_len = ((num_cycles + 7) >> 3) + first_tms;
- if (tms_len > 0)
+ if (vsllink_tms_data_len > 0)
{
- // Normal operation, don't need to append tms data
- vsllink_tms_data_len = num_cycles & 7;
-
- if (vsllink_tms_data_len > 0)
+ // num_cycles == 0
+ // no need to shift
+ if (num_cycles > 0)
{
- tms_len += 1;
+ LOG_ERROR("There MUST be some bugs in the driver");
+ exit(-1);
}
- // tms_len includes the length of tms byte to append
-
- // Make sure there is enough space
- // 1 more byte maybe needed for the last tms move
- vsllink_tap_ensure_space(0, (tms_len / VSLLINK_CMDJTAGSEQ_LENMSK) + tms_len + 1);
-
- while(tms_len > 0)
+ }
+ else
+ {
+ // get number of bytes left to be sent
+ tms_len = num_cycles >> 3;
+ if (tms_len > 0)
{
- if (tms_len > (VSLLINK_CMDJTAGSEQ_LENMSK + 1))
+ vsllink_tap_ensure_space(1, 5);
+ // if tms_len > 0, vsllink_tms_data_len == 0
+ // so just add new command
+ // LSB of the command byte is the tms value when do the shifting
+ if (tms > 0)
{
- i = VSLLINK_CMDJTAGSEQ_LENMSK + 1;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSCLOCK | 1;
}
else
{
- i = tms_len;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSCLOCK;
}
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (tms_len >> 0) & 0xff;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (tms_len >> 8) & 0xff;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (tms_len >> 16) & 0xff;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (tms_len >> 24) & 0xff;
- tms_cmd_pos = vsllink_usb_out_buffer_idx;
-
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | (i - 1);
+ vsllink_usb_in_want_length += 1;
+ pending_scan_results_buffer[pending_scan_results_length].buffer = NULL;
+ pending_scan_results_length++;
- if (first_tms)
+ if (tms_len > 0xFFFF)
{
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(cur_state, end_state);
- first_tms = 0;
- j = i - 1;
- }
- else
- {
- j = i;
- }
-
- while (j-- > 0)
- {
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 0;
+ vsllink_tap_execute();
}
-
- tms_len -= i;
}
- // post process vsllink_usb_out_buffer_idx
+ // post-process
+ vsllink_tms_data_len = num_cycles & 7;
if (vsllink_tms_data_len > 0)
{
- vsllink_usb_out_buffer_idx -= 2;
- }
-
- // Set end_state
- vsllink_end_state(saved_end_state);
- cur_state = TAP_IDLE;
- if (saved_end_state != TAP_IDLE)
- {
- if (vsllink_tms_data_len > 0)
+ vsllink_tap_ensure_space(0, 3);
+ vsllink_tms_cmd_pos = &vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | 1;
+ if (tms > 0)
{
- VSLLINK_add_tms_from_RTI(end_state);
+ // append '1' for tms
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = (1 << vsllink_tms_data_len) - 1;
}
else
{
- if (i < (VSLLINK_CMDJTAGSEQ_LENMSK + 1))
- {
- vsllink_usb_out_buffer[tms_cmd_pos]++;
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(TAP_IDLE, end_state);
- }
- else
- {
- vsllink_tap_ensure_space(0, 2);
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE;
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(TAP_IDLE, end_state);
- }
+ // append '0' for tms
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = 0x00;
}
- cur_state = saved_end_state;
- }
-
- if (vsllink_tms_data_len > 0)
- {
- vsllink_tms_cmd_pos = vsllink_usb_out_buffer + tms_cmd_pos;
}
}
- else
+}
+
+void vsllink_runtest(int num_cycles)
+{
+ tap_state_t saved_end_state = tap_get_end_state();
+
+ if (tap_get_state() != TAP_IDLE)
{
- // Set end_state if no RTI shifts
- vsllink_end_state(saved_end_state);
- cur_state = TAP_IDLE;
- if (saved_end_state != TAP_IDLE)
- {
- vsllink_tap_ensure_space(0, 2);
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE;
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(TAP_IDLE, end_state);
+ // enter into IDLE state
+ vsllink_end_state(TAP_IDLE);
+ vsllink_state_move();
+ }
- cur_state = saved_end_state;
- }
+ vsllink_stableclocks(num_cycles, 0);
+
+ // post-process
+ // set end_state
+ vsllink_end_state(saved_end_state);
+ tap_set_state(TAP_IDLE);
+ if (tap_get_end_state() != TAP_IDLE)
+ {
+ vsllink_state_move();
}
}
void vsllink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
{
- enum tap_state saved_end_state;
+ tap_state_t saved_end_state;
u8 bits_left, tms_tmp, tdi_len;
int i;
+ if (0 == scan_size )
+ {
+ return;
+ }
+
tdi_len = ((scan_size + 7) >> 3);
if ((tdi_len + 7) > VSLLINK_BufferSize)
{
LOG_ERROR("Your implementation of VSLLink has not enough buffer");
exit(-1);
}
-
- saved_end_state = end_state;
-
+
+ saved_end_state = tap_get_end_state();
+
/* Move to appropriate scan state */
vsllink_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT);
if (vsllink_tms_data_len > 0)
{
- if (cur_state == end_state)
+ if (tap_get_state() == tap_get_end_state())
{
- *vsllink_tms_cmd_pos--;
- tms_tmp = vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
- vsllink_tap_ensure_space(1, tdi_len + 7);
+ // already in IRSHIFT or DRSHIFT state
+ // merge tms data in the last tms shift command into next scan command
+ if(*vsllink_tms_cmd_pos < 1)
+ {
+ LOG_ERROR("There MUST be some bugs in the driver");
+ exit(-1);
+ }
+ else if(*vsllink_tms_cmd_pos < 2)
+ {
+ tms_tmp = vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
+ vsllink_usb_out_buffer_idx--;
+ }
+ else
+ {
+ tms_tmp = vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx];
+ *vsllink_tms_cmd_pos -= 2;
+ }
+ vsllink_tap_ensure_space(1, tdi_len + 7);
+ // VSLLINK_CMDJTAGSEQ_SCAN ored by 1 means that tms_before is valid
+ // which is merged from the last tms shift command
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_SCAN | 1;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1) >> 0) & 0xff;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1)>> 8) & 0xff;
vsllink_tap_append_scan(scan_size - vsllink_tms_data_len, buffer, command, vsllink_tms_data_len);
scan_size -= 8 - vsllink_tms_data_len;
+ vsllink_tms_data_len = 0;
}
else
{
- VSLLINK_add_tms_from_RTI(end_state);
+ vsllink_append_tms();
vsllink_tap_ensure_space(1, tdi_len + 5);
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_SCAN;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_SCAN | 1;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1) >> 0) & 0xff;
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = ((tdi_len + 1)>> 8) & 0xff;
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(cur_state, end_state);
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state());
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 0;
vsllink_tap_append_scan(scan_size, buffer, command, 8);
vsllink_end_state(saved_end_state);
bits_left = scan_size & 0x07;
- cur_state = ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE;
+ tap_set_state(ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE);
if (bits_left > 0)
{
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 1 << 7;
}
- if (cur_state != end_state)
+ if (tap_get_state() != tap_get_end_state())
{
- vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE_FROM_E1[tap_move_map[end_state]];
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state());
}
else
{
vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 0;
}
- cur_state = end_state;
+ tap_set_state(tap_get_end_state());
}
void vsllink_reset(int trst, int srst)
int result;
LOG_DEBUG("trst: %i, srst: %i", trst, srst);
-
+
/* Signals are active low */
vsllink_usb_out_buffer[0] = VSLLINK_CMD_SET_PORT;
vsllink_usb_out_buffer[1] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST;
void vsllink_simple_command(u8 command)
{
int result;
-
+
DEBUG_JTAG_IO("0x%02x", command);
-
+
vsllink_usb_out_buffer[0] = command;
result = vsllink_usb_write(vsllink_jtag_handle, 1);
-
+
if (result != 1)
{
LOG_ERROR("VSLLink command 0x%02x failed (%d)", command, result);
int vsllink_handle_usb_vid_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc != 1) {
- LOG_ERROR("parameter error, should be one parameter for VID");
+ LOG_ERROR("parameter error, should be one parameter for VID");
return ERROR_OK;
}
int vsllink_handle_usb_pid_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc != 1) {
- LOG_ERROR("parameter error, should be one parameter for PID");
+ LOG_ERROR("parameter error, should be one parameter for PID");
return ERROR_OK;
}
int vsllink_handle_usb_bulkin_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc != 1) {
- LOG_ERROR("parameter error, should be one parameter for BULKIN endpoint");
+ LOG_ERROR("parameter error, should be one parameter for BULKIN endpoint");
return ERROR_OK;
}
int vsllink_handle_usb_bulkout_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
if (argc != 1) {
- LOG_ERROR("parameter error, should be one parameter for BULKOUT endpoint");
+ LOG_ERROR("parameter error, should be one parameter for BULKOUT endpoint");
return ERROR_OK;
}
/***************************************************************************/
/* VSLLink tap functions */
-typedef struct
-{
- int length; /* Number of bits to read */
- int offset;
- scan_command_t *command; /* Corresponding scan command */
- u8 *buffer;
-} pending_scan_result_t;
-
-#define MAX_PENDING_SCAN_RESULTS 256
-
-static int pending_scan_results_length;
-static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
-
void vsllink_tap_init(void)
{
vsllink_usb_out_buffer_idx = 0;
{
int available_scans = MAX_PENDING_SCAN_RESULTS - pending_scan_results_length;
int available_bytes = VSLLINK_BufferSize - vsllink_usb_out_buffer_idx;
-
+
if (scans > available_scans || bytes > available_bytes)
{
vsllink_tap_execute();
- vsllink_usb_out_buffer[0] = VSLLINK_CMD_HW_JTAGSEQCMD;
- vsllink_usb_out_buffer_idx = 3;
}
}
}
/* Pad and send a tap sequence to the device, and receive the answer.
- * For the purpose of padding we assume that we are in idle or pause state. */
+ * For the purpose of padding we assume that we are in reset or idle or pause state. */
int vsllink_tap_execute(void)
{
int i;
if (vsllink_tms_data_len > 0)
{
+ if((tap_get_state() != TAP_RESET) && (tap_get_state() != TAP_IDLE) && (tap_get_state() != TAP_IRPAUSE) && (tap_get_state() != TAP_DRPAUSE))
+ {
+ LOG_WARNING("%s is not in RESET or IDLE or PAUSR state", tap_state_name(tap_get_state()));
+ }
+
if (vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] & (1 << (vsllink_tms_data_len - 1)))
{
// last tms bit is '1'
- // the only possible state is TLR, no need to control the number of shifts in RLT
- // There MUST be some errors in the code
- LOG_ERROR("last tms bit is '1'");
- exit(-1);
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= 0xFF << vsllink_tms_data_len;
+ vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 0xFF;
+ vsllink_tms_data_len = 0;
}
else
{
vsllink_tms_data_len = 0;
}
}
-
+
if (vsllink_usb_out_buffer_idx > 3)
{
if (vsllink_usb_out_buffer[0] == VSLLINK_CMD_HW_JTAGSEQCMD)
}
result = vsllink_usb_message(vsllink_jtag_handle, vsllink_usb_out_buffer_idx, vsllink_usb_in_want_length);
-
+
if (result == vsllink_usb_in_want_length)
{
for (i = 0; i < pending_scan_results_length; i++)
int length = pending_scan_result->length;
int offset = pending_scan_result->offset;
scan_command_t *command = pending_scan_result->command;
-
- /* Copy to buffer */
- buf_set_buf(vsllink_usb_in_buffer, first * 8 + offset, buffer, 0, length);
- first += (length + offset + 7) >> 3;
-
- DEBUG_JTAG_IO("JTAG scan read(%d bits):", length);
+
+ if (buffer != NULL)
+ {
+ // IRSHIFT or DRSHIFT
+ buf_set_buf(vsllink_usb_in_buffer, first * 8 + offset, buffer, 0, length);
+ first += (length + offset + 7) >> 3;
+
+ DEBUG_JTAG_IO("JTAG scan read(%d bits):", length);
#ifdef _DEBUG_JTAG_IO_
- vsllink_debug_buffer(buffer, (length + 7) >> 3);
+ vsllink_debug_buffer(buffer, (length + 7) >> 3);
#endif
- if (jtag_read_buffer(buffer, command) != ERROR_OK)
- {
- vsllink_tap_init();
- return ERROR_JTAG_QUEUE_FAILED;
- }
-
- if (pending_scan_result->buffer != NULL)
- {
+ if (jtag_read_buffer(buffer, command) != ERROR_OK)
+ {
+ vsllink_tap_init();
+ return ERROR_JTAG_QUEUE_FAILED;
+ }
+
free(pending_scan_result->buffer);
pending_scan_result->buffer = NULL;
}
+ else
+ {
+ first++;
+ }
}
}
else
LOG_ERROR("vsllink_tap_execute, wrong result %d, expected %d", result, vsllink_usb_in_want_length);
return ERROR_JTAG_QUEUE_FAILED;
}
-
+
vsllink_tap_init();
}
-
+
+ vsllink_usb_out_buffer[0] = VSLLINK_CMD_HW_JTAGSEQCMD;
+ vsllink_usb_out_buffer_idx = 3;
+
return ERROR_OK;
}
struct usb_bus *busses;
struct usb_bus *bus;
struct usb_device *dev;
-
+
vsllink_jtag_t *result;
-
+
result = (vsllink_jtag_t*) malloc(sizeof(vsllink_jtag_t));
-
+
usb_init();
usb_find_busses();
usb_find_devices();
-
+
busses = usb_get_busses();
-
+
/* find vsllink_jtag device in usb bus */
-
+
for (bus = busses; bus; bus = bus->next)
{
for (dev = bus->devices; dev; dev = dev->next)
if ((dev->descriptor.idVendor == vsllink_vid) && (dev->descriptor.idProduct == vsllink_pid))
{
result->usb_handle = usb_open(dev);
-
+
/* usb_set_configuration required under win32 */
usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue);
usb_claim_interface(result->usb_handle, 0);
-
+
#if 0
- /*
+ /*
* This makes problems under Mac OS X. And is not needed
* under Windows. Hopefully this will not break a linux build
*/
usb_set_altinterface(result->usb_handle, 0);
-#endif
+#endif
return result;
}
}
}
-
+
free(result);
return NULL;
}
int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int in_length)
{
int result;
-
+
result = vsllink_usb_write(vsllink_jtag, out_length);
if (result == out_length)
{
int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length)
{
int result;
-
+
if (out_length > VSLLINK_BufferSize)
{
LOG_ERROR("vsllink_jtag_write illegal out_length=%d (max=%d)", out_length, VSLLINK_BufferSize);
return -1;
}
-
+
result = usb_bulk_write(vsllink_jtag->usb_handle, vsllink_bulkout, \
(char *)vsllink_usb_out_buffer, out_length, VSLLINK_USB_TIMEOUT);
-
+
DEBUG_JTAG_IO("vsllink_usb_write, out_length = %d, result = %d", out_length, result);
-
+
#ifdef _DEBUG_USB_COMMS_
LOG_DEBUG("USB out:");
vsllink_debug_buffer(vsllink_usb_out_buffer, out_length);
(char *)vsllink_usb_in_buffer, VSLLINK_BufferSize, VSLLINK_USB_TIMEOUT);
DEBUG_JTAG_IO("vsllink_usb_read, result = %d", result);
-
+
#ifdef _DEBUG_USB_COMMS_
LOG_DEBUG("USB in:");
vsllink_debug_buffer(vsllink_usb_in_buffer, result);
char s[4];
int i;
int j;
-
+
for (i = 0; i < length; i += BYTES_PER_LINE)
{
snprintf(line, 5, "%04x", i);