@@ -22,8 +22,7 @@
#include <jtag/interface.h>
#include <jtag/interface.h>
#include <jtag/commands.h>
#include <jtag/commands.h>
#include <usb.h>
#include "usb_common.h"
#include "libusb_helper.h"
#define USB_VID 0x15ba
#define USB_VID 0x15ba
#define USB_PID 0x001e
#define USB_PID 0x001e
@@ -75,7 +74,7 @@ static void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_c
/* ARM-JTAG-EW lowlevel functions */
/* ARM-JTAG-EW lowlevel functions */
struct armjtagew {
struct armjtagew {
struct usb_dev_handle *usb_handle;
struct lib usb_device _handle *usb_handle;
};
};
static struct armjtagew *armjtagew_usb_open(void);
static struct armjtagew *armjtagew_usb_open(void);
@@ -684,35 +683,37 @@ static int armjtagew_tap_execute(void)
static struct armjtagew *armjtagew_usb_open(void)
static struct armjtagew *armjtagew_usb_open(void)
{
{
usb_init();
const uint16_t vids[] = { USB_VID, 0 };
const uint16_t vids[] = { USB_VID, 0 };
const uint16_t pids[] = { USB_PID, 0 };
const uint16_t pids[] = { USB_PID, 0 };
struct usb_dev_handle *dev;
if (jtag_usb_open(vids, pids, &dev) != ERROR_OK)
struct libusb_device_handle *dev;
if (jtag_libusb_open(vids, pids, NULL, &dev, NULL) != ERROR_OK)
return NULL;
return NULL;
struct armjtagew *result = malloc(sizeof(struct armjtagew));
struct armjtagew *result = malloc(sizeof(struct armjtagew));
result->usb_handle = dev;
result->usb_handle = dev;
#if 0
#if 0
/* usb_set_configuration required under win32 */
usb_set_configuration(dev, dev->config[0].bConfigurationValue);
/* libusb_set_configuration required under win32 */
struct libusb_config_descriptor *config;
struct libusb_device *usb_dev = libusb_get_device(dev);
libusb_get_config_descriptor(usb_dev, 0, &config);
libusb_set_configuration(dev, config->bConfigurationValue);
#endif
#endif
usb_claim_interface(dev, 0);
lib usb_claim_interface(dev, 0);
#if 0
#if 0
/*
/*
* This makes problems under Mac OS X. And is not needed
* This makes problems under Mac OS X. And is not needed
* under Windows. Hopefully this will not break a linux build
* under Windows. Hopefully this will not break a linux build
*/
*/
usb_set_alt interface(dev, 0);
lib usb_set_interface_alt_setting (dev, 0 , 0);
#endif
#endif
return result;
return result;
}
}
static void armjtagew_usb_close(struct armjtagew *armjtagew)
static void armjtagew_usb_close(struct armjtagew *armjtagew)
{
{
usb_close(armjtagew->usb_handle);
lib usb_close(armjtagew->usb_handle);
free(armjtagew);
free(armjtagew);
}
}
@@ -725,13 +726,13 @@ static int armjtagew_usb_message(struct armjtagew *armjtagew, int out_length, in
if (result == out_length) {
if (result == out_length) {
result = armjtagew_usb_read(armjtagew, in_length);
result = armjtagew_usb_read(armjtagew, in_length);
if (result != in_length) {
if (result != in_length) {
LOG_ERROR("usb_bulk_read failed (requested=%d, result=%d)",
LOG_ERROR("jtag_lib usb_bulk_read failed (requested=%d, result=%d)",
in_length,
in_length,
result);
result);
return -1;
return -1;
}
}
} else {
} else {
LOG_ERROR("usb_bulk_write failed (requested=%d, result=%d)", out_length, result);
LOG_ERROR("jtag_lib usb_bulk_write failed (requested=%d, result=%d)", out_length, result);
return -1;
return -1;
}
}
return 0;
return 0;
@@ -741,6 +742,7 @@ static int armjtagew_usb_message(struct armjtagew *armjtagew, int out_length, in
static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
{
{
int result;
int result;
int transferred;
if (out_length > ARMJTAGEW_OUT_BUFFER_SIZE) {
if (out_length > ARMJTAGEW_OUT_BUFFER_SIZE) {
LOG_ERROR("armjtagew_write illegal out_length=%d (max=%d)",
LOG_ERROR("armjtagew_write illegal out_length=%d (max=%d)",
@@ -749,29 +751,34 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
return -1;
return -1;
}
}
result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
(char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
result = jtag_lib usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
(char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT, &transferred );
LOG_DEBUG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
LOG_DEBUG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
#ifdef _DEBUG_USB_COMMS_
#ifdef _DEBUG_USB_COMMS_
armjtagew_debug_buffer(usb_out_buffer, out_length);
armjtagew_debug_buffer(usb_out_buffer, out_length);
#endif
#endif
return result;
if (result != ERROR_OK)
return -1;
return transferred;
}
}
/* Read data from USB into in_buffer. */
/* Read data from USB into in_buffer. */
static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
{
{
int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
(char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT);
int transferred;
int result = jtag_libusb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
(char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT, &transferred);
LOG_DEBUG_IO("armjtagew_usb_read, result = %d", result);
LOG_DEBUG_IO("armjtagew_usb_read, result = %d", result);
#ifdef _DEBUG_USB_COMMS_
#ifdef _DEBUG_USB_COMMS_
armjtagew_debug_buffer(usb_in_buffer, result);
armjtagew_debug_buffer(usb_in_buffer, result);
#endif
#endif
return result;
if (result != ERROR_OK)
return -1;
return transferred;
}
}
#ifdef _DEBUG_USB_COMMS_
#ifdef _DEBUG_USB_COMMS_