From 882543b1e42a960b714fa3aa9b05f9029513b5c1 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 13 Aug 2009 00:56:59 +0200 Subject: Remove obsolete patches, update code and comments for libusb git. Please use libusb git as of the time of this writing, or 1.0.3 whenever it comes out. --- usbmuxd/usb-linux.c | 4 ++-- usbmuxd/usb.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'usbmuxd') diff --git a/usbmuxd/usb-linux.c b/usbmuxd/usb-linux.c index b401cde..44eba2c 100644 --- a/usbmuxd/usb-linux.c +++ b/usbmuxd/usb-linux.c @@ -138,7 +138,7 @@ int usb_send(struct usb_device *dev, const unsigned char *buf, int length) libusb_free_transfer(xfer); return res; } - collection_add(&dev->tx_xfers, xfer);/* + collection_add(&dev->tx_xfers, xfer); if((length % 512) == 0) { usbmuxd_log(LL_DEBUG, "Send ZLP"); // Send Zero Length Packet @@ -152,7 +152,7 @@ int usb_send(struct usb_device *dev, const unsigned char *buf, int length) return res; } collection_add(&dev->tx_xfers, xfer); - }*/ + } return 0; } diff --git a/usbmuxd/usb.h b/usbmuxd/usb.h index 8a48308..7eea707 100644 --- a/usbmuxd/usb.h +++ b/usbmuxd/usb.h @@ -29,16 +29,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // libusb fragments packets larger than this (usbfs limitation) // on input, this creates race conditions and other issues -// I don't think the device uses larger packets -// if it does then we're going to have to implement proper framing... #define USB_MRU 16384 // max transmission packet size // libusb fragments these too, but doesn't send ZLPs so we're safe -// but maybe we need to send a ZLP ourselves at the end (see usb-linux.h) +// but we need to send a ZLP ourselves at the end (see usb-linux.c) // we're using 3 * 16384 to optimize for the fragmentation // this results in three URBs per full transfer, 32 USB packets each -// if there are ZLP issues this should make them show up too +// if there are ZLP issues this should make them show up easily too #define USB_MTU (3 * 16384) #define USB_PACKET_SIZE 512 -- cgit v1.1-32-gdbae