X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fjtag%2Fvsllink.c;h=cc3308f573c08daa97729e4f901dc84120d864e4;hb=d5e4e23f9a5b1074cd298d5386e638a9fa78b1ad;hp=7705e540ee2cb9bfe5787d668049454e9cc61177;hpb=e1c26950c03b09efe42b8a25dd83f1e50e22a507;p=openocd diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c index 7705e540..cc3308f5 100644 --- a/src/jtag/vsllink.c +++ b/src/jtag/vsllink.c @@ -28,9 +28,7 @@ #include "interface.h" #include "commands.h" - -#include - +#include "usb_common.h" //#define _VSLLINK_IN_DEBUG_MODE_ @@ -105,13 +103,12 @@ static uint8_t VSLLINK_tap_move[6][6] = {0xfe, 0x60, 0x38, 0x5c, 0x40, 0x5e} /* PI */ }; -typedef struct insert_insignificant_operation -{ +struct insert_insignificant_operation { unsigned char insert_value; unsigned char insert_position; -}insert_insignificant_operation_t; +}; -static insert_insignificant_operation_t VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[6][6] = +static struct insert_insignificant_operation VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[6][6] = { /* stuff offset */ {/* TLR */ @@ -166,7 +163,7 @@ static uint8_t VSLLINK_BIT_MSK[8] = struct pending_scan_result { int offset; int length; /* Number of bits to read */ - scan_command_t *command; /* Corresponding scan command */ + struct scan_command *command; /* Corresponding scan command */ uint8_t *buffer; }; @@ -187,9 +184,9 @@ 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, 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_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command); +static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command); +static void (*vsllink_scan)(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command); static void vsllink_reset(int trst, int srst); static void vsllink_simple_command(uint8_t command); static int vsllink_connect(void); @@ -206,20 +203,19 @@ 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, 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); +static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, struct scan_command *command); +static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, struct scan_command *command, int offset); /* VSLLink lowlevel functions */ -typedef struct vsllink_jtag -{ +struct vsllink { struct usb_dev_handle* usb_handle; -} vsllink_jtag_t; +}; -static vsllink_jtag_t *vsllink_usb_open(void); -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); -static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length); -static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag); +static struct vsllink *vsllink_usb_open(void); +static void vsllink_usb_close(struct vsllink *vsllink); +static int vsllink_usb_message(struct vsllink *vsllink, int out_length, int in_length); +static int vsllink_usb_write(struct vsllink *vsllink, int out_length); +static int vsllink_usb_read(struct vsllink *vsllink); #if defined _DEBUG_USB_COMMS_ || defined _DEBUG_JTAG_IO_ static void vsllink_debug_buffer(uint8_t *buffer, int length); @@ -235,7 +231,7 @@ static uint8_t *tdi_buffer = NULL; static uint8_t *tdo_buffer = NULL; static int last_tms; -static vsllink_jtag_t* vsllink_jtag_handle = NULL; +static struct vsllink* vsllink_handle = NULL; static void reset_command_pointer(void) { @@ -252,7 +248,7 @@ static void reset_command_pointer(void) static int vsllink_execute_queue(void) { - jtag_command_t *cmd = jtag_command_queue; + struct jtag_command *cmd = jtag_command_queue; int scan_size; enum scan_type type; uint8_t *buffer; @@ -369,7 +365,7 @@ static int vsllink_speed(int 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); + result = vsllink_usb_write(vsllink_handle, 3); if (result == 3) { @@ -412,9 +408,9 @@ static int vsllink_init(void) exit(-1); } - vsllink_jtag_handle = vsllink_usb_open(); + vsllink_handle = vsllink_usb_open(); - if (vsllink_jtag_handle == 0) + if (vsllink_handle == 0) { LOG_ERROR("Can't find USB JTAG Interface! Please check connection and permissions."); return ERROR_JTAG_INIT_FAILED; @@ -427,7 +423,7 @@ static int vsllink_init(void) while (check_cnt < 5) { vsllink_simple_command(0x00); - result = vsllink_usb_read(vsllink_jtag_handle); + result = vsllink_usb_read(vsllink_handle); if (result > 2) { @@ -516,7 +512,7 @@ static int vsllink_init(void) 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; - if (vsllink_usb_write(vsllink_jtag_handle, 3) != 3) + if (vsllink_usb_write(vsllink_handle, 3) != 3) { LOG_ERROR("VSLLink USB send data error"); exit(-1); @@ -539,7 +535,7 @@ static int vsllink_quit(void) 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) + if (vsllink_usb_write(vsllink_handle, 3) != 3) { LOG_ERROR("VSLLink USB send data error"); exit(-1); @@ -547,8 +543,8 @@ static int vsllink_quit(void) // disconnect vsllink_disconnect(); - vsllink_usb_close(vsllink_jtag_handle); - vsllink_jtag_handle = NULL; + vsllink_usb_close(vsllink_handle); + vsllink_handle = NULL; } if (vsllink_usb_in_buffer != NULL) @@ -579,8 +575,8 @@ static int vsllink_connect(void) vsllink_usb_out_buffer[0] = VSLLINK_CMD_CONN; vsllink_usb_out_buffer[1] = vsllink_mode; - vsllink_usb_message(vsllink_jtag_handle, 2, 0); - if (vsllink_usb_read(vsllink_jtag_handle) > 2) + vsllink_usb_message(vsllink_handle, 2, 0); + if (vsllink_usb_read(vsllink_handle) > 2) { strncpy(vsllink_str, (char *)vsllink_usb_in_buffer + 2, sizeof(vsllink_str)); LOG_INFO("%s", vsllink_str); @@ -595,7 +591,7 @@ static void vsllink_append_tms(void) { uint8_t tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); uint16_t tms2; - insert_insignificant_operation_t *insert = \ + struct insert_insignificant_operation *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)) || \ @@ -656,7 +652,7 @@ static void vsllink_state_move_normal(void) static void vsllink_state_move_dma(void) { int i, insert_length = (tap_length % 8) ? (8 - (tap_length % 8)) : 0; - insert_insignificant_operation_t *insert = \ + struct insert_insignificant_operation *insert = \ &VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())]; uint8_t tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state()); @@ -1139,7 +1135,7 @@ static void vsllink_runtest(int num_cycles) } } -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_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command) { tap_state_t saved_end_state; uint8_t bits_left, tms_tmp, tdi_len; @@ -1255,7 +1251,7 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buff tap_set_state(tap_get_end_state()); } -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_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command) { tap_state_t saved_end_state; @@ -1302,7 +1298,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); + result = vsllink_usb_write(vsllink_handle, 3); if (result != 3) { LOG_ERROR("VSLLink command VSLLINK_CMD_SET_PORT failed (%d)", result); @@ -1316,7 +1312,7 @@ static void vsllink_simple_command(uint8_t command) DEBUG_JTAG_IO("0x%02x", command); vsllink_usb_out_buffer[0] = command; - result = vsllink_usb_write(vsllink_jtag_handle, 1); + result = vsllink_usb_write(vsllink_handle, 1); if (result != 1) { @@ -1326,22 +1322,22 @@ static void vsllink_simple_command(uint8_t command) COMMAND_HANDLER(vsllink_handle_mode_command) { - if (argc != 1) { + if (CMD_ARGC != 1) { LOG_ERROR("parameter error, should be one parameter for VID"); return ERROR_FAIL; } - if (!strcmp(args[0], "normal")) + if (!strcmp(CMD_ARGV[0], "normal")) { vsllink_mode = VSLLINK_MODE_NORMAL; } - else if (!strcmp(args[0], "dma")) + else if (!strcmp(CMD_ARGV[0], "dma")) { vsllink_mode = VSLLINK_MODE_DMA; } else { - LOG_ERROR("invalid vsllink_mode: %s", args[0]); + LOG_ERROR("invalid vsllink_mode: %s", CMD_ARGV[0]); return ERROR_FAIL; } @@ -1350,36 +1346,36 @@ COMMAND_HANDLER(vsllink_handle_mode_command) COMMAND_HANDLER(vsllink_handle_usb_vid_command) { - if (argc != 1) + if (CMD_ARGC != 1) { LOG_ERROR("parameter error, should be one parameter for VID"); return ERROR_OK; } - COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_vid); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], vsllink_usb_vid); return ERROR_OK; } COMMAND_HANDLER(vsllink_handle_usb_pid_command) { - if (argc != 1) + if (CMD_ARGC != 1) { LOG_ERROR("parameter error, should be one parameter for PID"); return ERROR_OK; } - COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_pid); + COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], vsllink_usb_pid); return ERROR_OK; } COMMAND_HANDLER(vsllink_handle_usb_bulkin_command) { - if (argc != 1) + if (CMD_ARGC != 1) { LOG_ERROR("parameter error, should be one parameter for BULKIN endpoint"); return ERROR_OK; } - COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkin); + COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_bulkin); vsllink_usb_bulkin |= 0x80; @@ -1388,13 +1384,13 @@ COMMAND_HANDLER(vsllink_handle_usb_bulkin_command) COMMAND_HANDLER(vsllink_handle_usb_bulkout_command) { - if (argc != 1) + if (CMD_ARGC != 1) { LOG_ERROR("parameter error, should be one parameter for BULKOUT endpoint"); return ERROR_OK; } - COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkout); + COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_bulkout); vsllink_usb_bulkout &= ~0x80; @@ -1403,13 +1399,13 @@ COMMAND_HANDLER(vsllink_handle_usb_bulkout_command) COMMAND_HANDLER(vsllink_handle_usb_interface_command) { - if (argc != 1) + if (CMD_ARGC != 1) { LOG_ERROR("parameter error, should be one parameter for interface number"); return ERROR_OK; } - COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_interface); + COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_interface); return ERROR_OK; } @@ -1485,7 +1481,7 @@ static void vsllink_tap_append_step(int tms, int tdi) } } -static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset) +static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, struct scan_command *command, int offset) { struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length]; int i; @@ -1510,7 +1506,7 @@ static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_com pending_scan_results_length++; } -static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command) +static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, struct scan_command *command) { struct pending_scan_result *pending_scan_result; int len_tmp, len_all, i; @@ -1584,7 +1580,7 @@ static int vsllink_tap_execute_normal(void) 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); + result = vsllink_usb_message(vsllink_handle, vsllink_usb_out_buffer_idx, vsllink_usb_in_want_length); if (result == vsllink_usb_in_want_length) { @@ -1594,7 +1590,7 @@ static int vsllink_tap_execute_normal(void) 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; + struct scan_command *command = pending_scan_result->command; if (buffer != NULL) { @@ -1658,7 +1654,7 @@ static int vsllink_tap_execute_dma(void) 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); + result = vsllink_usb_message(vsllink_handle, 3 + 2 * byte_length, byte_length); if (result == byte_length) { for (i = 0; i < pending_scan_results_length; i++) @@ -1668,7 +1664,7 @@ static int vsllink_tap_execute_dma(void) int length = pending_scan_result->length; int first = pending_scan_result->offset; - scan_command_t *command = pending_scan_result->command; + struct scan_command *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); @@ -1703,100 +1699,78 @@ static int vsllink_tap_execute_dma(void) /*****************************************************************************/ /* VSLLink USB low-level functions */ -static vsllink_jtag_t* vsllink_usb_open(void) +static struct vsllink* vsllink_usb_open(void) { - struct usb_bus *busses; - 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(); + const uint16_t vids[] = { vsllink_usb_vid, 0 }; + const uint16_t pids[] = { vsllink_usb_pid, 0 }; + struct usb_dev_handle *dev; + if (jtag_usb_open(vids, pids, &dev) != ERROR_OK) + return NULL; - /* find vsllink_jtag device in usb bus */ - - for (bus = busses; bus; bus = bus->next) + /* usb_set_configuration required under win32 */ + struct usb_device *udev = usb_device(dev); + int ret = usb_set_configuration(dev, udev->config[0].bConfigurationValue); + if (ret != 0) { - for (dev = bus->devices; dev; dev = dev->next) - { - if ((dev->descriptor.idVendor == vsllink_usb_vid) && (dev->descriptor.idProduct == vsllink_usb_pid)) - { - result->usb_handle = usb_open(dev); - if (NULL == result->usb_handle) - { - 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) - { - LOG_ERROR("fail to set configuration to %d, %d returned, not enough permissions?", dev->config[0].bConfigurationValue, ret); - exit(-1); - } - ret = usb_claim_interface(result->usb_handle, vsllink_usb_interface); - if (ret != 0) - { - LOG_ERROR("fail to claim interface %d, %d returned", vsllink_usb_interface, ret); - exit(-1); - } - + LOG_ERROR("fail to set configuration to %d (error %d)." + "Not enough permissions for the device?", + udev->config[0].bConfigurationValue, ret); + return NULL; + } + ret = usb_claim_interface(dev, vsllink_usb_interface); + if (ret != 0) + { + LOG_ERROR("fail to claim interface %d, %d returned", + vsllink_usb_interface, ret); + return NULL; + } #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); + /* + * This makes problems under Mac OS X. And is not needed + * under Windows. Hopefully this will not break a linux build + */ + usb_set_altinterface(dev, 0); #endif - return result; - } - } - } - free(result); - return NULL; + struct vsllink *result = malloc(sizeof(struct vsllink)); + result->usb_handle = dev; + return result; } -static void vsllink_usb_close(vsllink_jtag_t *vsllink_jtag) +static void vsllink_usb_close(struct vsllink *vsllink) { int ret; - ret = usb_release_interface(vsllink_jtag->usb_handle, vsllink_usb_interface); + ret = usb_release_interface(vsllink->usb_handle, vsllink_usb_interface); if (ret != 0) { LOG_ERROR("fail to release interface %d, %d returned", vsllink_usb_interface, ret); exit(-1); } - ret = usb_close(vsllink_jtag->usb_handle); + ret = usb_close(vsllink->usb_handle); if (ret != 0) { LOG_ERROR("fail to close usb, %d returned", ret); exit(-1); } - free(vsllink_jtag); + free(vsllink); } /* Send a message and receive the reply. */ -static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int in_length) +static int vsllink_usb_message(struct vsllink *vsllink, int out_length, int in_length) { int result; - result = vsllink_usb_write(vsllink_jtag, out_length); + result = vsllink_usb_write(vsllink, out_length); if (result == out_length) { if (in_length > 0) { - result = vsllink_usb_read(vsllink_jtag); + result = vsllink_usb_read(vsllink); if (result == in_length) { return result; @@ -1817,17 +1791,17 @@ static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int } /* Write data from out_buffer to USB. */ -static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length) +static int vsllink_usb_write(struct vsllink *vsllink, 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); + LOG_ERROR("vsllink_write illegal out_length=%d (max=%d)", out_length, VSLLINK_BufferSize); return -1; } - result = usb_bulk_write(vsllink_jtag->usb_handle, vsllink_usb_bulkout, \ + result = usb_bulk_write(vsllink->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); @@ -1845,9 +1819,9 @@ static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length) } /* Read data from USB into in_buffer. */ -static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag) +static int vsllink_usb_read(struct vsllink *vsllink) { - int result = usb_bulk_read(vsllink_jtag->usb_handle, vsllink_usb_bulkin, \ + int result = usb_bulk_read(vsllink->usb_handle, vsllink_usb_bulkin, \ (char *)vsllink_usb_in_buffer, VSLLINK_BufferSize, VSLLINK_USB_TIMEOUT); DEBUG_JTAG_IO("vsllink_usb_read, result = %d", result); @@ -1882,33 +1856,44 @@ static void vsllink_debug_buffer(uint8_t *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; -} +static const struct command_registration vsllink_command_handlers[] = { + { + .name = "vsllink_usb_vid", + .handler = &vsllink_handle_usb_vid_command, + .mode = COMMAND_CONFIG, + }, + { + .name = "vsllink_usb_pid", + .handler = &vsllink_handle_usb_pid_command, + .mode = COMMAND_CONFIG, + }, + { + .name = "vsllink_usb_bulkin", + .handler = &vsllink_handle_usb_bulkin_command, + .mode = COMMAND_CONFIG, + }, + { + .name = "vsllink_usb_bulkout", + .handler = &vsllink_handle_usb_bulkout_command, + .mode = COMMAND_CONFIG, + }, + { + .name = "vsllink_usb_interface", + .handler = &vsllink_handle_usb_interface_command, + .mode = COMMAND_CONFIG, + }, + { + .name = "vsllink_mode", + .handler = &vsllink_handle_mode_command, + .mode = COMMAND_CONFIG, + }, + COMMAND_REGISTRATION_DONE +}; struct jtag_interface vsllink_interface = { .name = "vsllink", - .register_commands = &vsllink_register_commands, + .commands = vsllink_command_handlers, + .init = &vsllink_init, .quit = &vsllink_quit, .khz = &vsllink_khz,