interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vsllink: Port to libusb-1.0 API 

Change-Id: I8a9a4dace8e7e8152947094b27b86f9a0d90fa61
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Reviewed-on: http://openocd.zylin.com/1952
Tested-by: jenkins
Reviewed-by: Nemui Trinomius <nemuisan_kawausogasuki@live.jp>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Fatih Aşıcı 2014-02-18 09:55:15 +02:00 committed by Andreas Fritiofson
parent 5f9c59409b
commit 84281d711e
5 changed files with 103 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -196,7 +196,8 @@ m4_define([USB1_ADAPTERS],
[[stlink], [ST-Link JTAG Programmer], [HLADAPTER_STLINK]], [[stlink], [ST-Link JTAG Programmer], [HLADAPTER_STLINK]],
[[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]], [[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]],
[[ulink], [Keil ULINK JTAG Programmer], [ULINK]], [[ulink], [Keil ULINK JTAG Programmer], [ULINK]],
[[usb_blaster_2], [Altera USB-Blaster II Compatible], [USB_BLASTER_2]]]) [[usb_blaster_2], [Altera USB-Blaster II Compatible], [USB_BLASTER_2]],
[[vsllink], [Versaloon-Link JTAG Programmer], [VSLLINK]]])
m4_define([USB_ADAPTERS], m4_define([USB_ADAPTERS],
[[[jlink], [Segger J-Link JTAG Programmer], [JLINK]], [[[jlink], [Segger J-Link JTAG Programmer], [JLINK]],
@ -205,8 +206,7 @@ m4_define([USB_ADAPTERS],
[[aice], [Andes JTAG Programmer], [AICE]]]) [[aice], [Andes JTAG Programmer], [AICE]]])
m4_define([USB0_ADAPTERS], m4_define([USB0_ADAPTERS],
[[[vsllink], [Versaloon-Link JTAG Programmer], [VSLLINK]], [[[usbprog], [USBProg JTAG Programmer], [USBPROG]],
[[usbprog], [USBProg JTAG Programmer], [USBPROG]],
[[rlink], [Raisonance RLink JTAG Programmer], [RLINK]], [[rlink], [Raisonance RLink JTAG Programmer], [RLINK]],
[[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]]) [[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]])

29
src/jtag/drivers/versaloon/versaloon.c
View File

@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <libusb.h>
#include "versaloon_include.h" #include "versaloon_include.h"
#include "versaloon.h" #include "versaloon.h"
@ -36,7 +37,7 @@ uint16_t versaloon_buf_size;
struct versaloon_pending_t versaloon_pending[VERSALOON_MAX_PENDING_NUMBER]; struct versaloon_pending_t versaloon_pending[VERSALOON_MAX_PENDING_NUMBER];
uint16_t versaloon_pending_idx; uint16_t versaloon_pending_idx;
usb_dev_handle *versaloon_usb_device_handle; libusb_device_handle *versaloon_usb_device_handle;
static uint32_t versaloon_usb_to = VERSALOON_TIMEOUT; static uint32_t versaloon_usb_to = VERSALOON_TIMEOUT;
RESULT versaloon_init(void); RESULT versaloon_init(void);
@ -196,6 +197,7 @@ RESULT versaloon_add_pending(uint8_t type, uint8_t cmd, uint16_t actual_szie,
RESULT versaloon_send_command(uint16_t out_len, uint16_t *inlen) RESULT versaloon_send_command(uint16_t out_len, uint16_t *inlen)
{ {
int ret; int ret;
int transferred;
#if PARAM_CHECK #if PARAM_CHECK
if (NULL == versaloon_buf) { if (NULL == versaloon_buf) {
@ -208,25 +210,24 @@ RESULT versaloon_send_command(uint16_t out_len, uint16_t *inlen)
} }
#endif #endif
ret = usb_bulk_write(versaloon_usb_device_handle, ret = libusb_bulk_transfer(versaloon_usb_device_handle,
versaloon_interface.usb_setting.ep_out, (char *)versaloon_buf, versaloon_interface.usb_setting.ep_out,
out_len, versaloon_usb_to); versaloon_buf, out_len, &transferred, versaloon_usb_to);
if (ret != out_len) { if (0 != ret || transferred != out_len) {
LOG_ERROR(ERRMSG_FAILURE_OPERATION_ERRSTRING, "send usb data", LOG_ERROR(ERRMSG_FAILURE_OPERATION, "send usb data");
usb_strerror());
return ERRCODE_FAILURE_OPERATION; return ERRCODE_FAILURE_OPERATION;
} }
if (inlen != NULL) { if (inlen != NULL) {
ret = usb_bulk_read(versaloon_usb_device_handle, ret = libusb_bulk_transfer(versaloon_usb_device_handle,
versaloon_interface.usb_setting.ep_in, (char *)versaloon_buf, versaloon_interface.usb_setting.ep_in,
versaloon_interface.usb_setting.buf_size, versaloon_usb_to); versaloon_buf, versaloon_interface.usb_setting.buf_size,
if (ret > 0) { &transferred, versaloon_usb_to);
*inlen = (uint16_t)ret; if (0 == ret) {
*inlen = (uint16_t)transferred;
return ERROR_OK; return ERROR_OK;
} else { } else {
LOG_ERROR(ERRMSG_FAILURE_OPERATION_ERRSTRING, "receive usb data", LOG_ERROR(ERRMSG_FAILURE_OPERATION, "receive usb data");
usb_strerror());
return ERROR_FAIL; return ERROR_FAIL;
} }
} else } else

4
src/jtag/drivers/versaloon/versaloon.h
View File

@ -20,6 +20,8 @@
#ifndef __VERSALOON_H_INCLUDED__ #ifndef __VERSALOON_H_INCLUDED__
#define __VERSALOON_H_INCLUDED__ #define __VERSALOON_H_INCLUDED__
#include <libusb.h>
struct usart_status_t { struct usart_status_t {
uint32_t tx_buff_avail; uint32_t tx_buff_avail;
uint32_t tx_buff_size; uint32_t tx_buff_size;
@ -107,7 +109,7 @@ struct versaloon_interface_t {
}; };
extern struct versaloon_interface_t versaloon_interface; extern struct versaloon_interface_t versaloon_interface;
extern usb_dev_handle *versaloon_usb_device_handle; extern libusb_device_handle *versaloon_usb_device_handle;
#endif /* __VERSALOON_H_INCLUDED__ */ #endif /* __VERSALOON_H_INCLUDED__ */

2
src/jtag/drivers/versaloon/versaloon_include.h
View File

@ -21,7 +21,6 @@
/* according to different platform */ /* according to different platform */
#include <jtag/interface.h> #include <jtag/interface.h>
#include <jtag/commands.h> #include <jtag/commands.h>
#include "usb_common.h"
#define PARAM_CHECK 1 #define PARAM_CHECK 1
@ -49,7 +48,6 @@
#define ERRMSG_NOT_SUPPORT_BY "%s is not supported by %s." #define ERRMSG_NOT_SUPPORT_BY "%s is not supported by %s."
#define ERRMSG_FAILURE_OPERATION "Fail to %s." #define ERRMSG_FAILURE_OPERATION "Fail to %s."
#define ERRMSG_FAILURE_OPERATION_ERRSTRING "Fail to %s, error string is %s."
#define ERRMSG_FAILURE_OPERATION_MESSAGE "Fail to %s, %s" #define ERRMSG_FAILURE_OPERATION_MESSAGE "Fail to %s, %s"
#define ERRCODE_FAILURE_OPERATION ERROR_FAIL #define ERRCODE_FAILURE_OPERATION ERROR_FAIL

192
src/jtag/drivers/vsllink.c
View File

@ -29,7 +29,7 @@
#include <jtag/interface.h> #include <jtag/interface.h>
#include <jtag/commands.h> #include <jtag/commands.h>
#include <jtag/swd.h> #include <jtag/swd.h>
#include "usb_common.h" #include <libusb.h>
#include "versaloon/versaloon_include.h" #include "versaloon/versaloon_include.h"
#include "versaloon/versaloon.h" #include "versaloon/versaloon.h"
@ -79,10 +79,11 @@ static int vsllink_swd_switch_seq(struct adiv5_dap *dap,
/* VSLLink lowlevel functions */ /* VSLLink lowlevel functions */
struct vsllink { struct vsllink {
struct usb_dev_handle *usb_handle; struct libusb_context *libusb_ctx;
struct libusb_device_handle *usb_device_handle;
}; };
static struct vsllink *vsllink_usb_open(void); static int vsllink_usb_open(struct vsllink *vsllink);
static void vsllink_usb_close(struct vsllink *vsllink); static void vsllink_usb_close(struct vsllink *vsllink);
#if defined _DEBUG_JTAG_IO_ #if defined _DEBUG_JTAG_IO_
@ -98,7 +99,7 @@ static uint8_t *tdo_buffer;
static bool swd_mode; static bool swd_mode;
static int queued_retval; static int queued_retval;
struct vsllink *vsllink_handle; static struct vsllink *vsllink_handle;
static int vsllink_execute_queue(void) static int vsllink_execute_queue(void)
{ {
@ -296,13 +297,22 @@ static int vsllink_quit(void)
vsllink_free_buffer(); vsllink_free_buffer();
vsllink_usb_close(vsllink_handle); vsllink_usb_close(vsllink_handle);
free(vsllink_handle);
return ERROR_OK; return ERROR_OK;
} }
static int vsllink_interface_init(void) static int vsllink_interface_init(void)
{ {
vsllink_handle = vsllink_usb_open(); vsllink_handle = malloc(sizeof(struct vsllink));
if (vsllink_handle == 0) { if (NULL == vsllink_handle) {
LOG_ERROR("unable to allocate memory");
return ERROR_FAIL;
}
libusb_init(&vsllink_handle->libusb_ctx);
if (ERROR_OK != vsllink_usb_open(vsllink_handle)) {
LOG_ERROR("Can't find USB JTAG Interface!" \ LOG_ERROR("Can't find USB JTAG Interface!" \
"Please check connection and permissions."); "Please check connection and permissions.");
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
@ -310,7 +320,7 @@ static int vsllink_interface_init(void)
LOG_DEBUG("vsllink found on %04X:%04X", LOG_DEBUG("vsllink found on %04X:%04X",
versaloon_interface.usb_setting.vid, versaloon_interface.usb_setting.vid,
versaloon_interface.usb_setting.pid); versaloon_interface.usb_setting.pid);
versaloon_usb_device_handle = vsllink_handle->usb_handle; versaloon_usb_device_handle = vsllink_handle->usb_device_handle;
if (ERROR_OK != versaloon_interface.init()) if (ERROR_OK != versaloon_interface.init())
return ERROR_FAIL; return ERROR_FAIL;
@ -845,132 +855,94 @@ static int vsllink_swd_run_queue(struct adiv5_dap *dap)
/**************************************************************************** /****************************************************************************
* VSLLink USB low-level functions */ * VSLLink USB low-level functions */
static uint8_t usb_check_string(usb_dev_handle *usb, uint8_t stringidx, static int vsllink_check_usb_strings(
char *string, char *buff, uint16_t buf_size) struct libusb_device_handle *usb_device_handle,
struct libusb_device_descriptor *usb_desc)
{ {
int len; char desc_string[256];
uint8_t alloced = 0; int retval;
uint8_t ret = 1;
if (NULL == buff) { if (NULL != versaloon_interface.usb_setting.serialstring) {
buf_size = 256; retval = libusb_get_string_descriptor_ascii(usb_device_handle,
buff = malloc(buf_size); usb_desc->iSerialNumber, (unsigned char *)desc_string,
if (NULL == buff) { sizeof(desc_string));
ret = 0; if (retval < 0)
goto free_and_return; return ERROR_FAIL;
}
alloced = 1; if (strncmp(desc_string, versaloon_interface.usb_setting.serialstring,
sizeof(desc_string)))
return ERROR_FAIL;
} }
strcpy(buff, ""); retval = libusb_get_string_descriptor_ascii(usb_device_handle,
len = usb_get_string_simple(usb, stringidx, buff, buf_size); usb_desc->iProduct, (unsigned char *)desc_string,
if ((len < 0) || ((size_t)len != strlen(buff))) { sizeof(desc_string));
ret = 0; if (retval < 0)
goto free_and_return; return ERROR_FAIL;
}
buff[len] = '\0'; if (strstr(desc_string, "Versaloon") == NULL)
if ((string != NULL) && strcmp(buff, string)) { return ERROR_FAIL;
ret = 0;
goto free_and_return;
}
free_and_return: return ERROR_OK;
if (alloced && (buff != NULL)) {
free(buff);
buff = NULL;
}
return ret;
} }
static usb_dev_handle *find_usb_device(uint16_t VID, uint16_t PID, uint8_t interface, static int vsllink_usb_open(struct vsllink *vsllink)
char *serialstring, char *productstring)
{ {
usb_dev_handle *dev_handle = NULL; ssize_t num_devices, i;
struct usb_bus *busses; libusb_device **usb_devices;
struct usb_bus *bus; struct libusb_device_descriptor usb_desc;
struct usb_device *dev; struct libusb_device_handle *usb_device_handle;
int retval;
usb_init(); num_devices = libusb_get_device_list(vsllink->libusb_ctx, &usb_devices);
usb_find_busses();
usb_find_devices();
busses = usb_get_busses();
for (bus = busses; bus; bus = bus->next) { if (num_devices <= 0)
for (dev = bus->devices; dev; dev = dev->next) { return ERROR_FAIL;
if ((dev->descriptor.idVendor == VID)
&& (dev->descriptor.idProduct == PID)) {
dev_handle = usb_open(dev);
if (NULL == dev_handle) {
LOG_ERROR("failed to open %04X:%04X, %s", VID, PID,
usb_strerror());
continue;
}
/* check description string */ for (i = 0; i < num_devices; i++) {
if ((productstring != NULL && !usb_check_string(dev_handle, libusb_device *device = usb_devices[i];
dev->descriptor.iProduct, productstring, NULL, 0))
|| (serialstring != NULL && !usb_check_string(dev_handle,
dev->descriptor.iSerialNumber, serialstring, NULL, 0))) {
usb_close(dev_handle);
dev_handle = NULL;
continue;
}
if (usb_claim_interface(dev_handle, interface) != 0) { retval = libusb_get_device_descriptor(device, &usb_desc);
LOG_ERROR(ERRMSG_FAILURE_OPERATION_MESSAGE, if (retval != 0)
"claim interface", usb_strerror()); continue;
usb_close(dev_handle);
dev_handle = NULL;
continue;
}
if (dev_handle != NULL) if (usb_desc.idVendor != versaloon_interface.usb_setting.vid ||
return dev_handle; usb_desc.idProduct != versaloon_interface.usb_setting.pid)
} continue;
}
retval = libusb_open(device, &usb_device_handle);
if (retval != 0)
continue;
retval = vsllink_check_usb_strings(usb_device_handle, &usb_desc);
if (ERROR_OK == retval)
break;
libusb_close(usb_device_handle);
} }
return dev_handle; libusb_free_device_list(usb_devices, 1);
}
static struct vsllink *vsllink_usb_open(void) if (i == num_devices)
{ return ERROR_FAIL;
usb_init();
struct usb_dev_handle *dev; retval = libusb_claim_interface(usb_device_handle,
versaloon_interface.usb_setting.interface);
if (retval != 0) {
LOG_ERROR("unable to claim interface");
libusb_close(usb_device_handle);
return ERROR_FAIL;
}
dev = find_usb_device(versaloon_interface.usb_setting.vid, vsllink->usb_device_handle = usb_device_handle;
versaloon_interface.usb_setting.pid, return ERROR_OK;
versaloon_interface.usb_setting.interface,
versaloon_interface.usb_setting.serialstring, "Versaloon");
if (NULL == dev)
return NULL;
struct vsllink *result = malloc(sizeof(struct vsllink));
result->usb_handle = dev;
return result;
} }
static void vsllink_usb_close(struct vsllink *vsllink) static void vsllink_usb_close(struct vsllink *vsllink)
{ {
int ret; libusb_release_interface(vsllink->usb_device_handle,
versaloon_interface.usb_setting.interface);
ret = usb_release_interface(vsllink->usb_handle, libusb_close(vsllink->usb_device_handle);
versaloon_interface.usb_setting.interface);
if (ret != 0) {
LOG_ERROR("fail to release interface %d, %d returned",
versaloon_interface.usb_setting.interface, ret);
exit(-1);
}
ret = usb_close(vsllink->usb_handle);
if (ret != 0) {
LOG_ERROR("fail to close usb, %d returned", ret);
exit(-1);
}
free(vsllink);
} }
#define BYTES_PER_LINE 16 #define BYTES_PER_LINE 16