* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "log.h"
#include "libusb0_common.h"
+static int jtag_libusb_error(int err)
+{
+ switch (err) {
+ case 0:
+ return ERROR_OK;
+ case -ETIMEDOUT:
+ return ERROR_TIMEOUT_REACHED;
+ default:
+ return ERROR_FAIL;
+ }
+}
+
static bool jtag_libusb_match(struct jtag_libusb_device *dev,
const uint16_t vids[], const uint16_t pids[])
{
const char *serial,
struct jtag_libusb_device_handle **out)
{
- int retval = -ENODEV;
+ int retval = ERROR_FAIL;
+ bool serial_mismatch = false;
struct jtag_libusb_device_handle *libusb_handle;
usb_init();
libusb_handle = usb_open(dev);
if (NULL == libusb_handle) {
- retval = -errno;
+ LOG_ERROR("usb_open() failed with %s", usb_strerror());
continue;
}
/* Device must be open to use libusb_get_string_descriptor_ascii. */
if (serial != NULL &&
!string_descriptor_equal(libusb_handle, dev->descriptor.iSerialNumber, serial)) {
+ serial_mismatch = true;
usb_close(libusb_handle);
continue;
}
*out = libusb_handle;
- retval = 0;
+ retval = ERROR_OK;
+ serial_mismatch = false;
break;
}
}
+
+ if (serial_mismatch)
+ LOG_INFO("No device matches the serial string");
+
return retval;
}
}
int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
- int size, int timeout)
+ int size, int timeout, int *transferred)
{
- return usb_bulk_write(dev, ep, bytes, size, timeout);
+ int ret;
+
+ *transferred = 0;
+
+ ret = usb_bulk_write(dev, ep, bytes, size, timeout);
+
+ if (ret < 0) {
+ LOG_ERROR("usb_bulk_write error: %i", ret);
+ return jtag_libusb_error(ret);
+ }
+
+ return ERROR_OK;
}
int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
- int size, int timeout)
+ int size, int timeout, int *transferred)
{
- return usb_bulk_read(dev, ep, bytes, size, timeout);
+ int ret;
+
+ *transferred = 0;
+
+ ret = usb_bulk_read(dev, ep, bytes, size, timeout);
+
+ if (ret < 0) {
+ LOG_ERROR("usb_bulk_read error: %i", ret);
+ return jtag_libusb_error(ret);
+ }
+
+ return ERROR_OK;
}
int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
udev->config[configuration].bConfigurationValue);
}
-int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
+int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
unsigned int *usb_read_ep,
- unsigned int *usb_write_ep)
+ unsigned int *usb_write_ep,
+ int bclass, int subclass, int protocol, int trans_type)
{
+ struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
struct usb_interface *iface = udev->config->interface;
struct usb_interface_descriptor *desc = iface->altsetting;
+ *usb_read_ep = *usb_write_ep = 0;
+
for (int i = 0; i < desc->bNumEndpoints; i++) {
+ if ((bclass > 0 && desc->bInterfaceClass != bclass) ||
+ (subclass > 0 && desc->bInterfaceSubClass != subclass) ||
+ (protocol > 0 && desc->bInterfaceProtocol != protocol) ||
+ (trans_type > 0 && (desc->endpoint[i].bmAttributes & 0x3) != trans_type))
+ continue;
+
uint8_t epnum = desc->endpoint[i].bEndpointAddress;
bool is_input = epnum & 0x80;
LOG_DEBUG("usb ep %s %02x", is_input ? "in" : "out", epnum);
*usb_read_ep = epnum;
else
*usb_write_ep = epnum;
+
+ if (*usb_read_ep && *usb_write_ep) {
+ LOG_DEBUG("Claiming interface %d", (int)desc->bInterfaceNumber);
+ usb_claim_interface(devh, (int)desc->bInterfaceNumber);
+ return ERROR_OK;
+ }
}
- return 0;
+ return ERROR_FAIL;
}
int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)