X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fvsllink.c;h=b00846733aca245488e26e08a6bab47fd0ea0724;hp=cc2b271dfa2e612fd9b193b3a769cc2aa6b66d67;hb=8d6dcb9d39f0f948ef44beff991337b830fc4567;hpb=67caf323f74937e11c0f5f95c2ee57d2786ac02b diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c index cc2b271dfa..b00846733a 100644 --- a/src/jtag/vsllink.c +++ b/src/jtag/vsllink.c @@ -26,8 +26,8 @@ #include "config.h" #endif -#define INCLUDE_JTAG_INTERFACE_H #include "interface.h" +#include "commands.h" #include @@ -37,12 +37,12 @@ #define VSLLINK_MODE_NORMAL 0 #define VSLLINK_MODE_DMA 1 -static u16 vsllink_usb_vid; -static u16 vsllink_usb_pid; -static u8 vsllink_usb_bulkout; -static u8 vsllink_usb_bulkin; -static u8 vsllink_usb_interface; -static u8 vsllink_mode = VSLLINK_MODE_NORMAL; +static uint16_t vsllink_usb_vid; +static uint16_t vsllink_usb_pid; +static uint8_t vsllink_usb_bulkout; +static uint8_t vsllink_usb_bulkin; +static uint8_t vsllink_usb_interface; +static uint8_t vsllink_mode = VSLLINK_MODE_NORMAL; static int VSLLINK_USB_TIMEOUT = 10000; static int VSLLINK_BufferSize = 1024; @@ -50,8 +50,8 @@ static int VSLLINK_BufferSize = 1024; /* Global USB buffers */ static int vsllink_usb_out_buffer_idx; static int vsllink_usb_in_want_length; -static u8* vsllink_usb_in_buffer = NULL; -static u8* vsllink_usb_out_buffer = NULL; +static uint8_t* vsllink_usb_in_buffer = NULL; +static uint8_t* vsllink_usb_out_buffer = NULL; /* Constants for VSLLink command */ #define VSLLINK_CMD_CONN 0x80 @@ -91,10 +91,10 @@ static u8* vsllink_usb_out_buffer = NULL; * 3: Pause-DR * 4: Shift-IR * 5: Pause-IR - * + * * SD->SD and SI->SI have to be caught in interface specific code */ -static u8 VSLLINK_tap_move[6][6] = +static uint8_t VSLLINK_tap_move[6][6] = { /* TLR RTI SD PD SI PI */ {0xff, 0x7f, 0x2f, 0x0a, 0x37, 0x16}, /* TLR */ @@ -158,7 +158,7 @@ static insert_insignificant_operation_t VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[6] {0, 0,}}, /* PI */ }; -static u8 VSLLINK_BIT_MSK[8] = +static uint8_t VSLLINK_BIT_MSK[8] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f }; @@ -168,7 +168,7 @@ typedef struct int offset; int length; /* Number of bits to read */ scan_command_t *command; /* Corresponding scan command */ - u8 *buffer; + uint8_t *buffer; } pending_scan_result_t; #define MAX_PENDING_SCAN_RESULTS 256 @@ -176,23 +176,6 @@ typedef struct static int pending_scan_results_length; static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS]; -/* External interface functions */ -static int vsllink_execute_queue(void); -static int vsllink_speed(int speed); -static int vsllink_khz(int khz, int *jtag_speed); -static int vsllink_speed_div(int jtag_speed, int *khz); -static int vsllink_register_commands(struct command_context_s *cmd_ctx); -static int vsllink_init(void); -static int vsllink_quit(void); - -/* CLI command handler functions */ -static int vsllink_handle_usb_vid_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int vsllink_handle_usb_pid_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int vsllink_handle_usb_bulkin_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int vsllink_handle_usb_bulkout_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int vsllink_handle_usb_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int vsllink_handle_mode_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - /* Queue command functions */ static void vsllink_end_state(tap_state_t state); static void vsllink_state_move_dma(void); @@ -205,11 +188,11 @@ static void vsllink_runtest(int num_cycles); static void vsllink_stableclocks_dma(int num_cycles, int tms); static void vsllink_stableclocks_normal(int num_cycles, int tms); static void (*vsllink_stableclocks)(int num_cycles, int tms); -static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command); -static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command); -static void (*vsllink_scan)(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command); +static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command); +static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command); +static void (*vsllink_scan)(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command); static void vsllink_reset(int trst, int srst); -static void vsllink_simple_command(u8 command); +static void vsllink_simple_command(uint8_t command); static int vsllink_connect(void); static int vsllink_disconnect(void); @@ -224,8 +207,8 @@ static int (*vsllink_tap_execute)(void); static void vsllink_tap_ensure_space_dma(int scans, int length); static void vsllink_tap_ensure_space_normal(int scans, int length); static void (*vsllink_tap_ensure_space)(int scans, int length); -static void vsllink_tap_append_scan_dma(int length, u8 *buffer, scan_command_t *command); -static void vsllink_tap_append_scan_normal(int length, u8 *buffer, scan_command_t *command, int offset); +static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command); +static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset); /* VSLLink lowlevel functions */ typedef struct vsllink_jtag @@ -240,36 +223,21 @@ static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length); static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag); #if defined _DEBUG_USB_COMMS_ || defined _DEBUG_JTAG_IO_ -static void vsllink_debug_buffer(u8 *buffer, int length); +static void vsllink_debug_buffer(uint8_t *buffer, int length); #endif static int vsllink_tms_data_len = 0; -static u8* vsllink_tms_cmd_pos; +static uint8_t* vsllink_tms_cmd_pos; static int tap_length = 0; static int tap_buffer_size = 0; -static u8 *tms_buffer = NULL; -static u8 *tdi_buffer = NULL; -static u8 *tdo_buffer = NULL; +static uint8_t *tms_buffer = NULL; +static uint8_t *tdi_buffer = NULL; +static uint8_t *tdo_buffer = NULL; static int last_tms; static vsllink_jtag_t* vsllink_jtag_handle = NULL; -/***************************************************************************/ -/* External interface implementation */ - -jtag_interface_t vsllink_interface = -{ - .name = "vsllink", - .execute_queue = vsllink_execute_queue, - .speed = vsllink_speed, - .khz = vsllink_khz, - .speed_div = vsllink_speed_div, - .register_commands = vsllink_register_commands, - .init = vsllink_init, - .quit = vsllink_quit -}; - static void reset_command_pointer(void) { if (vsllink_mode == VSLLINK_MODE_NORMAL) @@ -288,7 +256,7 @@ static int vsllink_execute_queue(void) jtag_command_t *cmd = jtag_command_queue; int scan_size; enum scan_type type; - u8 *buffer; + uint8_t *buffer; DEBUG_JTAG_IO("--------------------------------- vsllink -------------------------------------"); @@ -298,31 +266,31 @@ static int vsllink_execute_queue(void) switch (cmd->type) { case JTAG_RUNTEST: - DEBUG_JTAG_IO( "runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, \ + DEBUG_JTAG_IO("runtest %i cycles, end in %s", cmd->cmd.runtest->num_cycles, \ tap_state_name(cmd->cmd.runtest->end_state)); - + 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 %s", tap_state_name(cmd->cmd.statemove->end_state)); - + vsllink_end_state(cmd->cmd.statemove->end_state); vsllink_state_move(); break; - + case JTAG_PATHMOVE: DEBUG_JTAG_IO("pathmove: %i states, end in %s", \ cmd->cmd.pathmove->num_states, \ 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: vsllink_end_state(cmd->cmd.scan->end_state); - + scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); if (cmd->cmd.scan->ir_scan) { @@ -332,37 +300,37 @@ static int vsllink_execute_queue(void) { 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_debug_buffer(buffer, (scan_size + 7) >> 3); #endif - + type = jtag_scan_type(cmd->cmd.scan); - + 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) { tap_set_state(TAP_RESET); } vsllink_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); 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()) + switch (tap_get_state()) { case TAP_RESET: // tms should be '1' to stay in TAP_RESET mode @@ -377,33 +345,33 @@ static int vsllink_execute_queue(void) 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()) ); + 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: %d", cmd->type); exit(-1); } cmd = cmd->next; } - + return vsllink_tap_execute(); } static int vsllink_speed(int speed) { int result; - + 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; @@ -413,21 +381,21 @@ static int vsllink_speed(int speed) LOG_ERROR("VSLLink setting speed failed (%d)", result); return ERROR_JTAG_DEVICE_ERROR; } - + return ERROR_OK; } static int vsllink_khz(int khz, int *jtag_speed) { *jtag_speed = khz; - + return ERROR_OK; } static int vsllink_speed_div(int jtag_speed, int *khz) { *khz = jtag_speed; - + return ERROR_OK; } @@ -436,7 +404,7 @@ static int vsllink_init(void) int check_cnt, to_tmp; int result; char version_str[100]; - + vsllink_usb_in_buffer = malloc(VSLLINK_BufferSize); vsllink_usb_out_buffer = malloc(VSLLINK_BufferSize); if ((vsllink_usb_in_buffer == NULL) || (vsllink_usb_out_buffer == NULL)) @@ -444,16 +412,16 @@ static int vsllink_init(void) LOG_ERROR("Not enough memory"); exit(-1); } - + 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; } LOG_DEBUG("vsllink found on %04X:%04X", vsllink_usb_vid, vsllink_usb_pid); - + to_tmp = VSLLINK_USB_TIMEOUT; VSLLINK_USB_TIMEOUT = 100; check_cnt = 0; @@ -461,20 +429,20 @@ static int vsllink_init(void) { vsllink_simple_command(0x00); result = vsllink_usb_read(vsllink_jtag_handle); - + if (result > 2) { vsllink_usb_in_buffer[result] = 0; VSLLINK_BufferSize = vsllink_usb_in_buffer[0] + (vsllink_usb_in_buffer[1] << 8); strncpy(version_str, (char *)vsllink_usb_in_buffer + 2, sizeof(version_str)); LOG_INFO("%s", version_str); - + // free the pre-alloc memroy free(vsllink_usb_in_buffer); free(vsllink_usb_out_buffer); vsllink_usb_in_buffer = NULL; vsllink_usb_out_buffer = NULL; - + // alloc new memory vsllink_usb_in_buffer = malloc(VSLLINK_BufferSize); vsllink_usb_out_buffer = malloc(VSLLINK_BufferSize); @@ -491,9 +459,9 @@ static int vsllink_init(void) if (vsllink_mode == VSLLINK_MODE_DMA) { tap_buffer_size = (VSLLINK_BufferSize - 3) / 2; - tms_buffer = (u8*)malloc(tap_buffer_size); - tdi_buffer = (u8*)malloc(tap_buffer_size); - tdo_buffer = (u8*)malloc(tap_buffer_size); + tms_buffer = (uint8_t*)malloc(tap_buffer_size); + tdi_buffer = (uint8_t*)malloc(tap_buffer_size); + tdo_buffer = (uint8_t*)malloc(tap_buffer_size); if ((tms_buffer == NULL) || (tdi_buffer == NULL) || (tdo_buffer == NULL)) { LOG_ERROR("Not enough memory"); @@ -512,7 +480,7 @@ static int vsllink_init(void) exit(-1); } VSLLINK_USB_TIMEOUT = to_tmp; - + // connect to vsllink vsllink_connect(); // initialize function pointers @@ -523,11 +491,11 @@ static int vsllink_init(void) vsllink_path_move = vsllink_path_move_normal; vsllink_stableclocks = vsllink_stableclocks_normal; vsllink_scan = vsllink_scan_normal; - + vsllink_tap_init = vsllink_tap_init_normal; vsllink_tap_execute = vsllink_tap_execute_normal; vsllink_tap_ensure_space = vsllink_tap_ensure_space_normal; - + LOG_INFO("vsllink run in NORMAL mode"); } else @@ -537,14 +505,14 @@ static int vsllink_init(void) vsllink_path_move = vsllink_path_move_dma; vsllink_stableclocks = vsllink_stableclocks_dma; vsllink_scan = vsllink_scan_dma; - + vsllink_tap_init = vsllink_tap_init_dma; vsllink_tap_execute = vsllink_tap_execute_dma; vsllink_tap_ensure_space = vsllink_tap_ensure_space_dma; - + LOG_INFO("vsllink run in DMA mode"); } - + // Set SRST and TRST to output, Set USR1 and USR2 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; @@ -554,13 +522,13 @@ static int vsllink_init(void) LOG_ERROR("VSLLink USB send data error"); exit(-1); } - + vsllink_reset(0, 0); - + LOG_INFO("VSLLink JTAG Interface ready"); - + vsllink_tap_init(); - + return ERROR_OK; } @@ -577,13 +545,13 @@ static int vsllink_quit(void) LOG_ERROR("VSLLink USB send data error"); exit(-1); } - + // disconnect vsllink_disconnect(); vsllink_usb_close(vsllink_jtag_handle); vsllink_jtag_handle = NULL; } - + if (vsllink_usb_in_buffer != NULL) { free(vsllink_usb_in_buffer); @@ -594,7 +562,7 @@ static int vsllink_quit(void) free(vsllink_usb_out_buffer); vsllink_usb_out_buffer = NULL; } - + return ERROR_OK; } @@ -609,7 +577,7 @@ static int vsllink_disconnect(void) static int vsllink_connect(void) { char vsllink_str[100]; - + vsllink_usb_out_buffer[0] = VSLLINK_CMD_CONN; vsllink_usb_out_buffer[1] = vsllink_mode; vsllink_usb_message(vsllink_jtag_handle, 2, 0); @@ -618,7 +586,7 @@ static int vsllink_connect(void) strncpy(vsllink_str, (char *)vsllink_usb_in_buffer + 2, sizeof(vsllink_str)); LOG_INFO("%s", vsllink_str); } - + return ERROR_OK; } @@ -626,11 +594,11 @@ static int vsllink_connect(void) // length of VSLLINK_CMDJTAGSEQ_TMSBYTE has been set, no need to set it here. static void vsllink_append_tms(void) { - u8 tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); - u16 tms2; + uint8_t tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); + uint16_t tms2; insert_insignificant_operation_t *insert = \ &VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())]; - + 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)) @@ -638,7 +606,7 @@ static void vsllink_append_tms(void) LOG_ERROR("There MUST be some bugs in the driver"); exit(-1); } - + tms2 = (tms_scan & VSLLINK_BIT_MSK[insert->insert_position]) << \ vsllink_tms_data_len; if (insert->insert_value == 1) @@ -648,10 +616,10 @@ static void vsllink_append_tms(void) } tms2 |= (tms_scan >> insert->insert_position) << \ (8 + insert->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; - + vsllink_tms_data_len = 0; vsllink_tms_cmd_pos = NULL; } @@ -679,11 +647,11 @@ static void vsllink_state_move_normal(void) 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_get_state(), tap_get_end_state()); } - + tap_set_state(tap_get_end_state()); } static void vsllink_state_move_dma(void) @@ -691,22 +659,22 @@ static void vsllink_state_move_dma(void) int i, insert_length = (tap_length % 8) ? (8 - (tap_length % 8)) : 0; insert_insignificant_operation_t *insert = \ &VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())]; - u8 tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); - + uint8_t tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); + if (tap_get_state() == TAP_RESET) { vsllink_tap_ensure_space(0, 8); - + for (i = 0; i < 8; i++) { vsllink_tap_append_step(1, 0); } } - + if (insert_length > 0) { vsllink_tap_ensure_space(0, 16); - + for (i = 0; i < insert->insert_position; i++) { vsllink_tap_append_step((tms_scan >> i) & 1, 0); @@ -723,13 +691,13 @@ static void vsllink_state_move_dma(void) else { vsllink_tap_ensure_space(0, 8); - + for (i = 0; i < 8; i++) { vsllink_tap_append_step((tms_scan >> i) & 1, 0); } } - + tap_set_state(tap_get_end_state()); } @@ -737,7 +705,7 @@ static void vsllink_state_move_dma(void) static void vsllink_add_path(int start, int num, tap_state_t *path) { int i; - + for (i = start; i < (start + num); i++) { if ((i & 7) == 0) @@ -748,7 +716,7 @@ static void vsllink_add_path(int start, int num, tap_state_t *path) } vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = 0; } - + if (path[i - start] == tap_state_transition(tap_get_state(), true)) { vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] |= 1 << (i & 7); @@ -769,14 +737,14 @@ static void vsllink_add_path(int start, int num, tap_state_t *path) vsllink_usb_out_buffer_idx++; vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = 0; } - + tap_set_end_state(tap_get_state()); } static void vsllink_path_move_normal(int num_states, tap_state_t *path) { int i, tms_len, tms_cmd_pos, path_idx = 0; - + if (vsllink_tms_data_len > 0) { // there are vsllink_tms_data_len more tms bits to be shifted @@ -827,7 +795,7 @@ static void vsllink_path_move_normal(int num_states, tap_state_t *path) // 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) { @@ -838,19 +806,19 @@ static void vsllink_path_move_normal(int num_states, tap_state_t *path) else { vsllink_add_path(vsllink_tms_data_len, 16 - vsllink_tms_data_len, path); - + path += 16 - vsllink_tms_data_len; num_states -= 16 - vsllink_tms_data_len; vsllink_tms_data_len = 0; vsllink_tms_cmd_pos = NULL; } } - + if (num_states > 0) { // Normal operation, don't need to append tms data vsllink_tms_data_len = num_states & 7; - + while (num_states > 0) { if (num_states > ((VSLLINK_CMDJTAGSEQ_LENMSK + 1) * 8)) @@ -865,13 +833,13 @@ static void vsllink_path_move_normal(int num_states, tap_state_t *path) vsllink_tap_ensure_space(0, tms_len + 2); tms_cmd_pos = vsllink_usb_out_buffer_idx; vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_CMDJTAGSEQ_TMSBYTE | (tms_len - 1); - + vsllink_add_path(0, i, path + path_idx); - + path_idx += i; num_states -= i; } - + if (vsllink_tms_data_len > 0) { if (tms_len < (VSLLINK_CMDJTAGSEQ_LENMSK + 1)) @@ -882,7 +850,7 @@ static void vsllink_path_move_normal(int num_states, tap_state_t *path) 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]; @@ -895,7 +863,7 @@ static void vsllink_path_move_normal(int num_states, tap_state_t *path) static void vsllink_path_move_dma(int num_states, tap_state_t *path) { int i, j = 0; - + if (tap_length & 7) { if ((8 - (tap_length & 7)) < num_states) @@ -925,11 +893,11 @@ static void vsllink_path_move_dma(int num_states, tap_state_t *path) } num_states -= j; } - + if (num_states > 0) { vsllink_tap_ensure_space(0, num_states); - + for (i = 0; i < num_states; i++) { if (path[j + i] == tap_state_transition(tap_get_state(), false)) @@ -948,15 +916,15 @@ static void vsllink_path_move_dma(int num_states, tap_state_t *path) tap_set_state(path[j + i]); } } - + tap_set_end_state(tap_get_state()); } static void vsllink_stableclocks_normal(int num_cycles, int tms) { int tms_len; - u16 tms_append_byte; - + uint16_t tms_append_byte; + if (vsllink_tms_data_len > 0) { // there are vsllink_tms_data_len more tms bits to be shifted @@ -965,7 +933,7 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) if (tms > 0) { // append '1' for tms - tms_append_byte = (u16)((((1 << num_cycles) - 1) << vsllink_tms_data_len) & 0xFFFF); + tms_append_byte = (uint16_t)((((1 << num_cycles) - 1) << vsllink_tms_data_len) & 0xFFFF); } else { @@ -980,14 +948,14 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) // 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); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] |= (uint8_t)(tms_append_byte & 0xFF); } else if (tms_len == 8) { // 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); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (uint8_t)(tms_append_byte & 0xFF); } else if (tms_len < 16) { @@ -997,8 +965,8 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) // 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); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (uint8_t)(tms_append_byte & 0xFF); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = (uint8_t)(tms_append_byte >> 8); } else { @@ -1008,21 +976,21 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) // 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); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (uint8_t)(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); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx] = (uint8_t)(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_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (uint8_t)(tms_append_byte & 0xFF); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (uint8_t)(tms_append_byte >> 8); } - + vsllink_tms_data_len = tms_len & 7; if (vsllink_tms_data_len == 0) { @@ -1033,16 +1001,16 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) else { // 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); - + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] |= (uint8_t)(tms_append_byte & 0xFF); + vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (uint8_t)(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 - + if (vsllink_tms_data_len > 0) { // num_cycles == 0 @@ -1075,17 +1043,17 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) 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; - + vsllink_usb_in_want_length += 1; pending_scan_results_buffer[pending_scan_results_length].buffer = NULL; pending_scan_results_length++; - + if (tms_len > 0xFFFF) { vsllink_tap_execute(); } } - + // post-process vsllink_tms_data_len = num_cycles & 7; if (vsllink_tms_data_len > 0) @@ -1109,7 +1077,7 @@ static void vsllink_stableclocks_normal(int num_cycles, int tms) static void vsllink_stableclocks_dma(int num_cycles, int tms) { int i, cur_cycles; - + if (tap_length & 7) { if ((8 - (tap_length & 7)) < num_cycles) @@ -1126,7 +1094,7 @@ static void vsllink_stableclocks_dma(int num_cycles, int tms) } num_cycles -= cur_cycles; } - + while (num_cycles > 0) { if (num_cycles > 8 * tap_buffer_size) @@ -1137,14 +1105,14 @@ static void vsllink_stableclocks_dma(int num_cycles, int tms) { cur_cycles = num_cycles; } - + vsllink_tap_ensure_space(0, cur_cycles); - + for (i = 0; i < cur_cycles; i++) { vsllink_tap_append_step(tms, 0); } - + num_cycles -= cur_cycles; } } @@ -1152,16 +1120,16 @@ static void vsllink_stableclocks_dma(int num_cycles, int tms) static void vsllink_runtest(int num_cycles) { tap_state_t saved_end_state = tap_get_end_state(); - + if (tap_get_state() != TAP_IDLE) { // enter into IDLE state vsllink_end_state(TAP_IDLE); vsllink_state_move(); } - + vsllink_stableclocks(num_cycles, 0); - + // post-process // set end_state vsllink_end_state(saved_end_state); @@ -1172,41 +1140,41 @@ static void vsllink_runtest(int num_cycles) } } -static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command) +static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command) { tap_state_t saved_end_state; - u8 bits_left, tms_tmp, tdi_len; + uint8_t bits_left, tms_tmp, tdi_len; int i; - - if (0 == scan_size ) + + 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 = 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 (tap_get_state() == tap_get_end_state()) { // 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) + 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) + else if (*vsllink_tms_cmd_pos < 2) { tms_tmp = vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx]; vsllink_usb_out_buffer_idx--; @@ -1216,16 +1184,16 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, i 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 + // 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_usb_out_buffer[vsllink_usb_out_buffer_idx++] = tms_tmp; vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = buffer[0] << (8 - vsllink_tms_data_len); - + for (i = 0; i < tdi_len; i++) { buffer[i] >>= 8 - vsllink_tms_data_len; @@ -1234,7 +1202,7 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, i buffer[i] += buffer[i + 1] << vsllink_tms_data_len; } } - + vsllink_tap_append_scan_normal(scan_size - vsllink_tms_data_len, buffer, command, vsllink_tms_data_len); scan_size -= 8 - vsllink_tms_data_len; vsllink_tms_data_len = 0; @@ -1243,31 +1211,31 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, i { vsllink_state_move(); 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++] = (tdi_len >> 0) & 0xff; vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = (tdi_len >> 8) & 0xff; - + vsllink_tap_append_scan_normal(scan_size, buffer, command, 0); } } else { vsllink_tap_ensure_space(1, tdi_len + 7); - + 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(tap_get_state(), tap_get_end_state()); vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 0; - + vsllink_tap_append_scan_normal(scan_size, buffer, command, 8); } vsllink_end_state(saved_end_state); - + bits_left = scan_size & 0x07; tap_set_state(ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE); - + if (bits_left > 0) { vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 1 << (bits_left - 1); @@ -1276,7 +1244,7 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, i { vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 1 << 7; } - + if (tap_get_state() != tap_get_end_state()) { vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); @@ -1285,31 +1253,31 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, i { vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = 0; } - + tap_set_state(tap_get_end_state()); } -static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command) +static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command) { tap_state_t saved_end_state; - + saved_end_state = tap_get_end_state(); - + /* Move to appropriate scan state */ vsllink_end_state(ir_scan ? TAP_IRSHIFT : TAP_DRSHIFT); - + vsllink_state_move(); vsllink_end_state(saved_end_state); - + /* Scan */ vsllink_tap_append_scan_dma(scan_size, buffer, command); - + tap_set_state(ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE); while (tap_length % 8 != 0) { // more 0s in Pause vsllink_tap_append_step(0, 0); } - + if (tap_get_state() != tap_get_end_state()) { vsllink_state_move(); @@ -1319,9 +1287,9 @@ static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int static 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; @@ -1334,7 +1302,7 @@ static void vsllink_reset(int trst, int srst) { vsllink_usb_out_buffer[2] |= JTAG_PINMSK_TRST; } - + result = vsllink_usb_write(vsllink_jtag_handle, 3); if (result != 3) { @@ -1342,46 +1310,28 @@ static void vsllink_reset(int trst, int srst) } } -static void vsllink_simple_command(u8 command) +static void vsllink_simple_command(uint8_t 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); } } -static int vsllink_register_commands(struct command_context_s *cmd_ctx) -{ - 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, - COMMAND_CONFIG, NULL); - 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, - COMMAND_CONFIG, NULL); - register_command(cmd_ctx, NULL, "vsllink_usb_interface", vsllink_handle_usb_interface_command, - COMMAND_CONFIG, NULL); - register_command(cmd_ctx, NULL, "vsllink_mode", vsllink_handle_mode_command, - COMMAND_CONFIG, NULL); - - return ERROR_OK; -} - static int vsllink_handle_mode_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"); return ERROR_FAIL; } - + if (!strcmp(args[0], "normal")) { vsllink_mode = VSLLINK_MODE_NORMAL; @@ -1395,7 +1345,7 @@ static int vsllink_handle_mode_command(struct command_context_s *cmd_ctx, char * LOG_ERROR("invalid vsllink_mode: %s", args[0]); return ERROR_FAIL; } - + return ERROR_OK; } @@ -1406,9 +1356,8 @@ static int vsllink_handle_usb_vid_command(struct command_context_s *cmd_ctx, cha LOG_ERROR("parameter error, should be one parameter for VID"); return ERROR_OK; } - - vsllink_usb_vid = strtol(args[0], NULL, 0); - + + COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_vid); return ERROR_OK; } @@ -1419,9 +1368,7 @@ static int vsllink_handle_usb_pid_command(struct command_context_s *cmd_ctx, cha LOG_ERROR("parameter error, should be one parameter for PID"); return ERROR_OK; } - - vsllink_usb_pid = strtol(args[0], NULL, 0); - + COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_pid); return ERROR_OK; } @@ -1432,9 +1379,11 @@ static int vsllink_handle_usb_bulkin_command(struct command_context_s *cmd_ctx, LOG_ERROR("parameter error, should be one parameter for BULKIN endpoint"); return ERROR_OK; } - - vsllink_usb_bulkin = strtol(args[0], NULL, 0) | 0x80; - + + COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkin); + + vsllink_usb_bulkin |= 0x80; + return ERROR_OK; } @@ -1445,9 +1394,11 @@ static int vsllink_handle_usb_bulkout_command(struct command_context_s *cmd_ctx, LOG_ERROR("parameter error, should be one parameter for BULKOUT endpoint"); return ERROR_OK; } - - vsllink_usb_bulkout = strtol(args[0], NULL, 0); - + + COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkout); + + vsllink_usb_bulkout &= ~0x80; + return ERROR_OK; } @@ -1458,9 +1409,8 @@ static int vsllink_handle_usb_interface_command(struct command_context_s *cmd_ct LOG_ERROR("parameter error, should be one parameter for interface number"); return ERROR_OK; } - - vsllink_usb_interface = strtol(args[0], NULL, 0); - + + COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_interface); return ERROR_OK; } @@ -1483,7 +1433,7 @@ static void vsllink_tap_ensure_space_normal(int scans, int length) { 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 || length > available_bytes) { vsllink_tap_execute(); @@ -1493,7 +1443,7 @@ static void vsllink_tap_ensure_space_dma(int scans, int length) { int available_scans = MAX_PENDING_SCAN_RESULTS - pending_scan_results_length; int available_bytes = tap_buffer_size * 8 - tap_length; - + if (scans > available_scans || length > available_bytes) { vsllink_tap_execute(); @@ -1504,12 +1454,12 @@ static void vsllink_tap_append_step(int tms, int tdi) { last_tms = tms; int index = tap_length / 8; - + if (index < tap_buffer_size) { int bit_index = tap_length % 8; - u8 bit = 1 << bit_index; - + uint8_t bit = 1 << bit_index; + if (tms) { tms_buffer[index] |= bit; @@ -1518,7 +1468,7 @@ static void vsllink_tap_append_step(int tms, int tdi) { tms_buffer[index] &= ~bit; } - + if (tdi) { tdi_buffer[index] |= bit; @@ -1527,7 +1477,7 @@ static void vsllink_tap_append_step(int tms, int tdi) { tdi_buffer[index] &= ~bit; } - + tap_length++; } else @@ -1536,11 +1486,11 @@ static void vsllink_tap_append_step(int tms, int tdi) } } -static void vsllink_tap_append_scan_normal(int length, u8 *buffer, scan_command_t *command, int offset) +static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset) { pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length]; int i; - + if (offset > 0) { vsllink_usb_in_want_length += ((length + 7) >> 3) + 1; @@ -1553,19 +1503,19 @@ static void vsllink_tap_append_scan_normal(int length, u8 *buffer, scan_command_ pending_scan_result->offset = offset; pending_scan_result->command = command; pending_scan_result->buffer = buffer; - + for (i = 0; i < ((length + 7) >> 3); i++) { vsllink_usb_out_buffer[vsllink_usb_out_buffer_idx++] = buffer[i]; } - + pending_scan_results_length++; } -static void vsllink_tap_append_scan_dma(int length, u8 *buffer, scan_command_t *command) +static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command) { pending_scan_result_t *pending_scan_result; int len_tmp, len_all, i; - + len_all = 0; while (len_all < length) { @@ -1577,20 +1527,20 @@ static void vsllink_tap_append_scan_dma(int length, u8 *buffer, scan_command_t * { len_tmp = length - len_all; } - + vsllink_tap_ensure_space(1, (len_tmp + 7) & ~7); - + pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length]; pending_scan_result->offset = tap_length; pending_scan_result->length = len_tmp; pending_scan_result->command = command; pending_scan_result->buffer = buffer + len_all / 8; - + for (i = 0; i < len_tmp; i++) { - vsllink_tap_append_step(((len_all+i) < length-1 ? 0 : 1), (buffer[(len_all+i)/8] >> ((len_all+i)%8)) & 1); + vsllink_tap_append_step(((len_all + i) < length-1 ? 0 : 1), (buffer[(len_all + i)/8] >> ((len_all + i)%8)) & 1); } - + pending_scan_results_length++; len_all += len_tmp; } @@ -1603,14 +1553,14 @@ static int vsllink_tap_execute_normal(void) int i; int result; int first = 0; - + 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)) + 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' @@ -1626,7 +1576,7 @@ static int vsllink_tap_execute_normal(void) vsllink_tms_data_len = 0; } } - + if (vsllink_usb_out_buffer_idx > 3) { if (vsllink_usb_out_buffer[0] == VSLLINK_CMD_HW_JTAGSEQCMD) @@ -1634,36 +1584,36 @@ static int vsllink_tap_execute_normal(void) vsllink_usb_out_buffer[1] = (vsllink_usb_out_buffer_idx >> 0) & 0xff; vsllink_usb_out_buffer[2] = (vsllink_usb_out_buffer_idx >> 8) & 0xff; } - + 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++) { pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[i]; - u8 *buffer = pending_scan_result->buffer; + uint8_t *buffer = pending_scan_result->buffer; int length = pending_scan_result->length; int offset = pending_scan_result->offset; scan_command_t *command = pending_scan_result->command; - + 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); #endif - + 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; } @@ -1678,11 +1628,11 @@ static int vsllink_tap_execute_normal(void) LOG_ERROR("vsllink_tap_execute, wrong result %d, expected %d", result, vsllink_usb_in_want_length); return ERROR_JTAG_QUEUE_FAILED; } - + vsllink_tap_init(); } reset_command_pointer(); - + return ERROR_OK; } static int vsllink_tap_execute_dma(void) @@ -1690,7 +1640,7 @@ static int vsllink_tap_execute_dma(void) int byte_length; int i; int result; - + if (tap_length > 0) { /* Pad last byte so that tap_length is divisible by 8 */ @@ -1701,38 +1651,38 @@ static int vsllink_tap_execute_dma(void) vsllink_tap_append_step(last_tms, 0); } byte_length = tap_length / 8; - + vsllink_usb_out_buffer[0] = VSLLINK_CMD_HW_JTAGRAWCMD; vsllink_usb_out_buffer[1] = ((byte_length * 2 + 3) >> 0) & 0xff; // package size vsllink_usb_out_buffer[2] = ((byte_length * 2 + 3) >> 8) & 0xff; - + memcpy(&vsllink_usb_out_buffer[3], tdi_buffer, byte_length); memcpy(&vsllink_usb_out_buffer[3 + byte_length], tms_buffer, byte_length); - + result = vsllink_usb_message(vsllink_jtag_handle, 3 + 2 * byte_length, byte_length); if (result == byte_length) { for (i = 0; i < pending_scan_results_length; i++) { pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[i]; - u8 *buffer = pending_scan_result->buffer; + uint8_t *buffer = pending_scan_result->buffer; int length = pending_scan_result->length; int first = pending_scan_result->offset; - + scan_command_t *command = pending_scan_result->command; buf_set_buf(vsllink_usb_in_buffer, first, buffer, 0, length); - + DEBUG_JTAG_IO("JTAG scan read(%d bits, from %d bits):", length, first); #ifdef _DEBUG_JTAG_IO_ 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) { free(pending_scan_result->buffer); @@ -1744,10 +1694,10 @@ static int vsllink_tap_execute_dma(void) LOG_ERROR("vsllink_tap_execute, wrong result %d, expected %d", result, byte_length); return ERROR_JTAG_QUEUE_FAILED; } - + vsllink_tap_init(); } - + return ERROR_OK; } @@ -1760,19 +1710,19 @@ static vsllink_jtag_t* vsllink_usb_open(void) struct usb_bus *bus; struct usb_device *dev; int ret; - + 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) @@ -1785,7 +1735,7 @@ static vsllink_jtag_t* vsllink_usb_open(void) LOG_ERROR("failed to open %04X:%04X, not enough permissions?", vsllink_usb_vid, vsllink_usb_pid); exit(-1); } - + /* usb_set_configuration required under win32 */ ret = usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue); if (ret != 0) @@ -1799,19 +1749,19 @@ static vsllink_jtag_t* vsllink_usb_open(void) LOG_ERROR("fail to claim interface %d, %d returned", vsllink_usb_interface, ret); exit(-1); } - + #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; } @@ -1841,14 +1791,14 @@ static void vsllink_usb_close(vsllink_jtag_t *vsllink_jtag) static 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) { if (in_length > 0) { result = vsllink_usb_read(vsllink_jtag); - if (result == in_length ) + if (result == in_length) { return result; } @@ -1871,18 +1821,18 @@ static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int static 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_usb_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); @@ -1900,9 +1850,9 @@ static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag) { int result = usb_bulk_read(vsllink_jtag->usb_handle, vsllink_usb_bulkin, \ (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); @@ -1913,13 +1863,13 @@ static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag) #define BYTES_PER_LINE 16 #if defined _DEBUG_USB_COMMS_ || defined _DEBUG_JTAG_IO_ -static void vsllink_debug_buffer(u8 *buffer, int length) +static void vsllink_debug_buffer(uint8_t *buffer, int length) { char line[81]; char s[4]; int i; int j; - + for (i = 0; i < length; i += BYTES_PER_LINE) { snprintf(line, 5, "%04x", i); @@ -1932,3 +1882,38 @@ static void vsllink_debug_buffer(u8 *buffer, int length) } } #endif // _DEBUG_USB_COMMS_ || _DEBUG_JTAG_IO_ + +static int vsllink_register_commands(struct command_context_s *cmd_ctx) +{ + 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, COMMAND_CONFIG, + NULL); + 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, COMMAND_CONFIG, + NULL); + register_command(cmd_ctx, NULL, "vsllink_usb_interface", + vsllink_handle_usb_interface_command, COMMAND_CONFIG, + NULL); + register_command(cmd_ctx, NULL, "vsllink_mode", + vsllink_handle_mode_command, COMMAND_CONFIG, + NULL); + + return ERROR_OK; +} + +jtag_interface_t vsllink_interface = { + .name = "vsllink", + .register_commands = &vsllink_register_commands, + .init = &vsllink_init, + .quit = &vsllink_quit, + .khz = &vsllink_khz, + .speed = &vsllink_speed, + .speed_div = &vsllink_speed_div, + .execute_queue = &vsllink_execute_queue, + };