2005-06-19 21:38:03 +00:00
|
|
|
/*
|
|
|
|
* avrdude - A Downloader/Uploader for AVR device programmers
|
2006-01-12 23:13:50 +00:00
|
|
|
* Copyright (C) 2005,2006 Joerg Wunsch
|
2006-01-12 23:24:35 +00:00
|
|
|
* Copyright (C) 2006 David Moore
|
2005-06-19 21:38:03 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2012-11-20 14:03:50 +00:00
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2005-06-19 21:38:03 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* USB interface via libusb for avrdude.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "ac_cfg.h"
|
|
|
|
#if defined(HAVE_LIBUSB)
|
|
|
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
2012-01-20 09:39:56 +00:00
|
|
|
#if defined(HAVE_USB_H)
|
|
|
|
# include <usb.h>
|
|
|
|
#elif defined(HAVE_LUSB0_USB_H)
|
|
|
|
# include <lusb0_usb.h>
|
|
|
|
#else
|
|
|
|
# error "libusb needs either <usb.h> or <lusb0_usb.h>"
|
|
|
|
#endif
|
2005-06-19 21:38:03 +00:00
|
|
|
|
2007-01-24 21:07:54 +00:00
|
|
|
#include "avrdude.h"
|
2005-06-19 21:38:03 +00:00
|
|
|
#include "serial.h"
|
2006-01-12 23:13:50 +00:00
|
|
|
#include "usbdevs.h"
|
2005-06-19 21:38:03 +00:00
|
|
|
|
2008-03-29 22:10:11 +00:00
|
|
|
#if defined(WIN32NATIVE)
|
|
|
|
/* someone has defined "interface" to "struct" in Cygwin */
|
|
|
|
# undef interface
|
|
|
|
#endif
|
|
|
|
|
2012-11-28 22:39:01 +00:00
|
|
|
static char usbbuf[USBDEV_MAX_XFER_3];
|
2005-06-19 21:38:03 +00:00
|
|
|
static int buflen = -1, bufptr;
|
|
|
|
|
2005-09-26 12:19:01 +00:00
|
|
|
static int usb_interface;
|
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
/*
|
|
|
|
* The "baud" parameter is meaningless for USB devices, so we reuse it
|
|
|
|
* to pass the desired USB device ID.
|
|
|
|
*/
|
2010-10-22 14:29:56 +00:00
|
|
|
static int usbdev_open(char * port, long baud, union filedescriptor *fd)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
|
|
|
char string[256];
|
2006-01-12 23:13:50 +00:00
|
|
|
char product[256];
|
2005-06-19 21:38:03 +00:00
|
|
|
struct usb_bus *bus;
|
|
|
|
struct usb_device *dev;
|
|
|
|
usb_dev_handle *udev;
|
|
|
|
char *serno, *cp2;
|
2008-03-14 13:00:08 +00:00
|
|
|
int i;
|
2005-06-19 21:38:03 +00:00
|
|
|
size_t x;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The syntax for usb devices is defined as:
|
|
|
|
*
|
|
|
|
* -P usb[:serialnumber]
|
|
|
|
*
|
|
|
|
* See if we've got a serial number passed here. The serial number
|
|
|
|
* might contain colons which we remove below, and we compare it
|
|
|
|
* right-to-left, so only the least significant nibbles need to be
|
|
|
|
* specified.
|
|
|
|
*/
|
|
|
|
if ((serno = strchr(port, ':')) != NULL)
|
|
|
|
{
|
|
|
|
/* first, drop all colons there if any */
|
|
|
|
cp2 = ++serno;
|
|
|
|
|
|
|
|
while ((cp2 = strchr(cp2, ':')) != NULL)
|
|
|
|
{
|
|
|
|
x = strlen(cp2) - 1;
|
|
|
|
memmove(cp2, cp2 + 1, x);
|
|
|
|
cp2[x] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strlen(serno) > 12)
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): invalid serial number \"%s\"\n",
|
|
|
|
progname, serno);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-26 16:24:56 +00:00
|
|
|
if (fd->usb.max_xfer == 0)
|
|
|
|
fd->usb.max_xfer = USBDEV_MAX_XFER_MKII;
|
|
|
|
|
2005-06-19 21:38:03 +00:00
|
|
|
usb_init();
|
|
|
|
|
|
|
|
usb_find_busses();
|
|
|
|
usb_find_devices();
|
|
|
|
|
2005-09-26 12:19:01 +00:00
|
|
|
for (bus = usb_get_busses(); bus; bus = bus->next)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
|
|
|
for (dev = bus->devices; dev; dev = dev->next)
|
|
|
|
{
|
|
|
|
udev = usb_open(dev);
|
|
|
|
if (udev)
|
|
|
|
{
|
|
|
|
if (dev->descriptor.idVendor == USB_VENDOR_ATMEL &&
|
2006-01-12 23:13:50 +00:00
|
|
|
dev->descriptor.idProduct == (unsigned short)baud)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
|
|
|
/* yeah, we found something */
|
|
|
|
if (usb_get_string_simple(udev,
|
|
|
|
dev->descriptor.iSerialNumber,
|
|
|
|
string, sizeof(string)) < 0)
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usb_open(): cannot read serial number \"%s\"\n",
|
|
|
|
progname, usb_strerror());
|
2005-07-25 19:52:20 +00:00
|
|
|
/*
|
|
|
|
* On some systems, libusb appears to have
|
|
|
|
* problems sending control messages. Catch the
|
|
|
|
* benign case where the user did not request a
|
|
|
|
* particular serial number, so we could
|
|
|
|
* continue anyway.
|
|
|
|
*/
|
|
|
|
if (serno != NULL)
|
|
|
|
exit(1); /* no chance */
|
|
|
|
else
|
|
|
|
strcpy(string, "[unknown]");
|
2005-06-19 21:38:03 +00:00
|
|
|
}
|
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
if (usb_get_string_simple(udev,
|
|
|
|
dev->descriptor.iProduct,
|
|
|
|
product, sizeof(product)) < 0)
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usb_open(): cannot read product name \"%s\"\n",
|
|
|
|
progname, usb_strerror());
|
|
|
|
strcpy(product, "[unnamed product]");
|
|
|
|
}
|
|
|
|
|
2005-06-19 21:38:03 +00:00
|
|
|
if (verbose)
|
|
|
|
fprintf(stderr,
|
2006-01-12 23:13:50 +00:00
|
|
|
"%s: usbdev_open(): Found %s, serno: %s\n",
|
|
|
|
progname, product, string);
|
2005-06-19 21:38:03 +00:00
|
|
|
if (serno != NULL)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* See if the serial number requested by the
|
|
|
|
* user matches what we found, matching
|
|
|
|
* right-to-left.
|
|
|
|
*/
|
|
|
|
x = strlen(string) - strlen(serno);
|
|
|
|
if (strcasecmp(string + x, serno) != 0)
|
|
|
|
{
|
|
|
|
if (verbose > 2)
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): serial number doesn't match\n",
|
|
|
|
progname);
|
|
|
|
usb_close(udev);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-26 12:19:01 +00:00
|
|
|
if (dev->config == NULL)
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): USB device has no configuration\n",
|
|
|
|
progname);
|
|
|
|
goto trynext;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (usb_set_configuration(udev, dev->config[0].bConfigurationValue))
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): error setting configuration %d: %s\n",
|
|
|
|
progname, dev->config[0].bConfigurationValue,
|
|
|
|
usb_strerror());
|
|
|
|
goto trynext;
|
|
|
|
}
|
|
|
|
|
|
|
|
usb_interface = dev->config[0].interface[0].altsetting[0].bInterfaceNumber;
|
|
|
|
if (usb_claim_interface(udev, usb_interface))
|
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): error claiming interface %d: %s\n",
|
|
|
|
progname, usb_interface, usb_strerror());
|
|
|
|
goto trynext;
|
|
|
|
}
|
|
|
|
|
2008-03-14 13:00:08 +00:00
|
|
|
fd->usb.handle = udev;
|
2012-11-26 16:24:56 +00:00
|
|
|
if (fd->usb.rep == 0)
|
|
|
|
{
|
|
|
|
/* Try finding out what our read endpoint is. */
|
|
|
|
for (i = 0; i < dev->config[0].interface[0].altsetting[0].bNumEndpoints; i++)
|
2008-03-14 13:00:08 +00:00
|
|
|
{
|
|
|
|
int possible_ep = dev->config[0].interface[0].altsetting[0].
|
2012-11-26 16:24:56 +00:00
|
|
|
endpoint[i].bEndpointAddress;
|
2008-03-14 13:00:08 +00:00
|
|
|
|
|
|
|
if ((possible_ep & USB_ENDPOINT_DIR_MASK) != 0)
|
2012-11-26 16:24:56 +00:00
|
|
|
{
|
|
|
|
if (verbose > 1)
|
2008-03-14 13:00:08 +00:00
|
|
|
{
|
2012-11-26 16:24:56 +00:00
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): using read endpoint 0x%02x\n",
|
|
|
|
progname, possible_ep);
|
2008-03-14 13:00:08 +00:00
|
|
|
}
|
2012-11-26 16:24:56 +00:00
|
|
|
fd->usb.rep = possible_ep;
|
|
|
|
break;
|
|
|
|
}
|
2008-03-14 13:00:08 +00:00
|
|
|
}
|
2012-11-26 16:24:56 +00:00
|
|
|
if (fd->usb.rep == 0)
|
2008-03-14 13:00:08 +00:00
|
|
|
{
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: usbdev_open(): cannot find a read endpoint, using 0x%02x\n",
|
2012-11-26 16:24:56 +00:00
|
|
|
progname, USBDEV_BULK_EP_READ_MKII);
|
|
|
|
fd->usb.rep = USBDEV_BULK_EP_READ_MKII;
|
2008-03-14 13:00:08 +00:00
|
|
|
}
|
2012-11-26 16:24:56 +00:00
|
|
|
}
|
2010-10-22 14:29:56 +00:00
|
|
|
return 0;
|
2005-06-19 21:38:03 +00:00
|
|
|
}
|
2005-09-26 12:19:01 +00:00
|
|
|
trynext:
|
2005-06-19 21:38:03 +00:00
|
|
|
usb_close(udev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(stderr, "%s: usbdev_open(): did not find any%s USB device \"%s\"\n",
|
|
|
|
progname, serno? " (matching)": "", port);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static void usbdev_close(union filedescriptor *fd)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
2008-03-14 13:00:08 +00:00
|
|
|
usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
|
2005-06-19 21:38:03 +00:00
|
|
|
|
2005-09-26 12:19:01 +00:00
|
|
|
(void)usb_release_interface(udev, usb_interface);
|
2006-01-12 23:13:50 +00:00
|
|
|
|
2009-11-29 20:19:15 +00:00
|
|
|
#if !( defined(__FreeBSD__) ) // || ( defined(__APPLE__) && defined(__MACH__) ) )
|
2006-01-12 23:13:50 +00:00
|
|
|
/*
|
|
|
|
* Without this reset, the AVRISP mkII seems to stall the second
|
2009-02-17 17:09:53 +00:00
|
|
|
* time we try to connect to it. This is not necessary on
|
|
|
|
* FreeBSD.
|
2006-01-12 23:13:50 +00:00
|
|
|
*/
|
|
|
|
usb_reset(udev);
|
2009-02-17 17:09:53 +00:00
|
|
|
#endif
|
2006-01-12 23:13:50 +00:00
|
|
|
|
2005-06-19 21:38:03 +00:00
|
|
|
usb_close(udev);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int usbdev_send(union filedescriptor *fd, unsigned char *bp, size_t mlen)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
2008-03-14 13:00:08 +00:00
|
|
|
usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
|
2006-12-11 12:47:35 +00:00
|
|
|
int rv;
|
2006-01-12 23:13:50 +00:00
|
|
|
int i = mlen;
|
|
|
|
unsigned char * p = bp;
|
|
|
|
int tx_size;
|
2005-06-19 21:38:03 +00:00
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
/*
|
|
|
|
* Split the frame into multiple packets. It's important to make
|
|
|
|
* sure we finish with a short packet, or else the device won't know
|
|
|
|
* the frame is finished. For example, if we need to send 64 bytes,
|
|
|
|
* we must send a packet of length 64 followed by a packet of length
|
|
|
|
* 0.
|
|
|
|
*/
|
|
|
|
do {
|
2012-11-26 16:24:56 +00:00
|
|
|
tx_size = (mlen < fd->usb.max_xfer)? mlen: fd->usb.max_xfer;
|
2012-11-30 12:36:00 +00:00
|
|
|
rv = usb_bulk_write(udev, fd->usb.wep, (char *)bp, tx_size, 10000);
|
2006-01-12 23:13:50 +00:00
|
|
|
if (rv != tx_size)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "%s: usbdev_send(): wrote %d out of %d bytes, err = %s\n",
|
|
|
|
progname, rv, tx_size, usb_strerror());
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
bp += tx_size;
|
|
|
|
mlen -= tx_size;
|
2012-11-26 16:24:56 +00:00
|
|
|
} while (tx_size == fd->usb.max_xfer);
|
2006-01-12 23:13:50 +00:00
|
|
|
|
|
|
|
if (verbose > 3)
|
2005-09-26 12:19:01 +00:00
|
|
|
{
|
2006-01-12 23:13:50 +00:00
|
|
|
fprintf(stderr, "%s: Sent: ", progname);
|
|
|
|
|
|
|
|
while (i) {
|
|
|
|
unsigned char c = *p;
|
|
|
|
if (isprint(c)) {
|
|
|
|
fprintf(stderr, "%c ", c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr, ". ");
|
|
|
|
}
|
|
|
|
fprintf(stderr, "[%02x] ", c);
|
|
|
|
|
|
|
|
p++;
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "\n");
|
2005-09-26 12:19:01 +00:00
|
|
|
}
|
|
|
|
return 0;
|
2005-06-19 21:38:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* As calls to usb_bulk_read() result in exactly one USB request, we
|
|
|
|
* have to buffer the read results ourselves, so the single-char read
|
|
|
|
* requests performed by the upper layers will be handled. In order
|
|
|
|
* to do this, we maintain a private buffer of what we've got so far,
|
|
|
|
* and transparently issue another USB read request if the buffer is
|
|
|
|
* empty and more data are requested.
|
|
|
|
*/
|
|
|
|
static int
|
2012-11-26 16:24:56 +00:00
|
|
|
usb_fill_buf(usb_dev_handle *udev, int maxsize, int ep)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
|
|
|
int rv;
|
|
|
|
|
2012-11-30 12:36:00 +00:00
|
|
|
rv = usb_bulk_read(udev, ep, usbbuf, maxsize, 10000);
|
2005-06-19 21:38:03 +00:00
|
|
|
if (rv < 0)
|
|
|
|
{
|
|
|
|
if (verbose > 1)
|
|
|
|
fprintf(stderr, "%s: usb_fill_buf(): usb_bulk_read() error %s\n",
|
|
|
|
progname, usb_strerror());
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
buflen = rv;
|
|
|
|
bufptr = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int usbdev_recv(union filedescriptor *fd, unsigned char *buf, size_t nbytes)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
2008-03-14 13:00:08 +00:00
|
|
|
usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
|
2005-06-19 21:38:03 +00:00
|
|
|
int i, amnt;
|
2005-08-30 04:44:29 +00:00
|
|
|
unsigned char * p = buf;
|
2005-06-19 21:38:03 +00:00
|
|
|
|
|
|
|
for (i = 0; nbytes > 0;)
|
|
|
|
{
|
|
|
|
if (buflen <= bufptr)
|
|
|
|
{
|
2012-11-26 16:24:56 +00:00
|
|
|
if (usb_fill_buf(udev, fd->usb.max_xfer, fd->usb.rep) < 0)
|
2005-06-19 21:38:03 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
amnt = buflen - bufptr > nbytes? nbytes: buflen - bufptr;
|
|
|
|
memcpy(buf + i, usbbuf + bufptr, amnt);
|
|
|
|
bufptr += amnt;
|
|
|
|
nbytes -= amnt;
|
|
|
|
i += amnt;
|
|
|
|
}
|
|
|
|
|
2009-10-10 20:09:59 +00:00
|
|
|
if (verbose > 4)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
|
|
|
fprintf(stderr, "%s: Recv: ", progname);
|
|
|
|
|
|
|
|
while (i) {
|
|
|
|
unsigned char c = *p;
|
|
|
|
if (isprint(c)) {
|
|
|
|
fprintf(stderr, "%c ", c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr, ". ");
|
|
|
|
}
|
|
|
|
fprintf(stderr, "[%02x] ", c);
|
|
|
|
|
|
|
|
p++;
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
/*
|
|
|
|
* This version of recv keeps reading packets until we receive a short
|
|
|
|
* packet. Then, the entire frame is assembled and returned to the
|
|
|
|
* user. The length will be unknown in advance, so we return the
|
|
|
|
* length as the return value of this function, or -1 in case of an
|
|
|
|
* error.
|
|
|
|
*
|
|
|
|
* This is used for the AVRISP mkII device.
|
|
|
|
*/
|
2006-12-11 12:47:35 +00:00
|
|
|
static int usbdev_recv_frame(union filedescriptor *fd, unsigned char *buf, size_t nbytes)
|
2006-01-12 23:13:50 +00:00
|
|
|
{
|
2008-03-14 13:00:08 +00:00
|
|
|
usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
|
2006-01-12 23:13:50 +00:00
|
|
|
int rv, n;
|
|
|
|
int i;
|
|
|
|
unsigned char * p = buf;
|
|
|
|
|
2012-11-28 22:39:01 +00:00
|
|
|
/* If there's an event EP, and it has data pending, return it first. */
|
|
|
|
if (fd->usb.eep != 0)
|
|
|
|
{
|
|
|
|
rv = usb_bulk_read(udev, fd->usb.eep, usbbuf,
|
|
|
|
fd->usb.max_xfer, 1);
|
|
|
|
if (rv > 4)
|
|
|
|
{
|
2012-11-29 21:43:54 +00:00
|
|
|
memcpy(buf, usbbuf, rv);
|
|
|
|
n = rv;
|
|
|
|
n |= USB_RECV_FLAG_EVENT;
|
2012-11-28 22:39:01 +00:00
|
|
|
goto printout;
|
|
|
|
}
|
|
|
|
else if (rv > 0)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "Short event len = %d, ignored.\n", rv);
|
2012-11-29 21:43:54 +00:00
|
|
|
/* fallthrough */
|
2012-11-28 22:39:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
n = 0;
|
|
|
|
do
|
|
|
|
{
|
2012-11-26 16:24:56 +00:00
|
|
|
rv = usb_bulk_read(udev, fd->usb.rep, usbbuf,
|
2012-11-30 12:36:00 +00:00
|
|
|
fd->usb.max_xfer, 10000);
|
2006-01-12 23:13:50 +00:00
|
|
|
if (rv < 0)
|
|
|
|
{
|
|
|
|
if (verbose > 1)
|
|
|
|
fprintf(stderr, "%s: usbdev_recv_frame(): usb_bulk_read(): %s\n",
|
|
|
|
progname, usb_strerror());
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rv <= nbytes)
|
|
|
|
{
|
|
|
|
memcpy (buf, usbbuf, rv);
|
|
|
|
buf += rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
n += rv;
|
|
|
|
nbytes -= rv;
|
|
|
|
}
|
2012-11-26 16:24:56 +00:00
|
|
|
while (rv == fd->usb.max_xfer);
|
2006-01-12 23:13:50 +00:00
|
|
|
|
|
|
|
if (nbytes < 0)
|
|
|
|
return -1;
|
|
|
|
|
2012-11-28 22:39:01 +00:00
|
|
|
printout:
|
2006-01-12 23:13:50 +00:00
|
|
|
if (verbose > 3)
|
|
|
|
{
|
2012-11-29 21:43:54 +00:00
|
|
|
i = n & USB_RECV_LENGTH_MASK;
|
2006-01-12 23:13:50 +00:00
|
|
|
fprintf(stderr, "%s: Recv: ", progname);
|
|
|
|
|
|
|
|
while (i) {
|
|
|
|
unsigned char c = *p;
|
|
|
|
if (isprint(c)) {
|
|
|
|
fprintf(stderr, "%c ", c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr, ". ");
|
|
|
|
}
|
|
|
|
fprintf(stderr, "[%02x] ", c);
|
|
|
|
|
|
|
|
p++;
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
return n;
|
|
|
|
}
|
2005-06-19 21:38:03 +00:00
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int usbdev_drain(union filedescriptor *fd, int display)
|
2005-06-19 21:38:03 +00:00
|
|
|
{
|
2008-03-14 13:00:08 +00:00
|
|
|
usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
|
2005-09-16 15:01:52 +00:00
|
|
|
int rv;
|
|
|
|
|
|
|
|
do {
|
2012-11-26 16:24:56 +00:00
|
|
|
rv = usb_bulk_read(udev, fd->usb.rep, usbbuf, fd->usb.max_xfer, 100);
|
2005-09-16 15:01:52 +00:00
|
|
|
if (rv > 0 && verbose >= 4)
|
|
|
|
fprintf(stderr, "%s: usbdev_drain(): flushed %d characters\n",
|
|
|
|
progname, rv);
|
|
|
|
} while (rv > 0);
|
|
|
|
|
2005-06-19 21:38:03 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
/*
|
|
|
|
* Device descriptor for the JTAG ICE mkII.
|
|
|
|
*/
|
2005-06-19 21:38:03 +00:00
|
|
|
struct serial_device usb_serdev =
|
|
|
|
{
|
|
|
|
.open = usbdev_open,
|
|
|
|
.close = usbdev_close,
|
|
|
|
.send = usbdev_send,
|
|
|
|
.recv = usbdev_recv,
|
|
|
|
.drain = usbdev_drain,
|
2006-10-27 08:45:47 +00:00
|
|
|
.flags = SERDEV_FL_NONE,
|
2005-06-19 21:38:03 +00:00
|
|
|
};
|
|
|
|
|
2006-01-12 23:13:50 +00:00
|
|
|
/*
|
|
|
|
* Device descriptor for the AVRISP mkII.
|
|
|
|
*/
|
|
|
|
struct serial_device usb_serdev_frame =
|
|
|
|
{
|
|
|
|
.open = usbdev_open,
|
|
|
|
.close = usbdev_close,
|
|
|
|
.send = usbdev_send,
|
|
|
|
.recv = usbdev_recv_frame,
|
|
|
|
.drain = usbdev_drain,
|
2006-10-27 08:45:47 +00:00
|
|
|
.flags = SERDEV_FL_NONE,
|
2006-01-12 23:13:50 +00:00
|
|
|
};
|
|
|
|
|
2005-06-19 21:38:03 +00:00
|
|
|
#endif /* HAVE_LIBUSB */
|