diff options
| author | Nathan Hjelm <hjelmn@cs.unm.edu> | 2013-02-08 00:12:13 -0700 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2013-05-15 20:43:35 +0200 |
| commit | ae712a7be927d3ee4ed81ceae06a839f872fe8ff (patch) | |
| tree | 4d6d9ef856da717dde94d41bf045940fcbe35dc6 | |
| parent | 7598cc176c844d50dac6287b919fafca02cf5d08 (diff) | |
| download | libusb-ae712a7be927d3ee4ed81ceae06a839f872fe8ff.tar.gz | |
darwin: add support for the LIBUSB_TRANSFER_ADD_ZERO_PACKET transfer flag.
The zero-length packet is sent by the async event thread if all the following
conditions are met:
1) The packet size is not a multiple of maxPacketSize, and
2) the transfer completed successfully.
References #6.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | libusb/os/darwin_usb.c | 25 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index df456f8..bc51b91 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -1374,9 +1374,6 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) { struct darwin_interface *cInterface; - if (IS_XFEROUT(transfer) && transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) - return LIBUSB_ERROR_NOT_SUPPORTED; - if (ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface) != 0) { usbi_err (TRANSFER_CTX (transfer), "endpoint not found on any open interface"); @@ -1388,6 +1385,11 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) { (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number, &transferType, &maxPacketSize, &interval); + if (0 != (transfer->length % maxPacketSize)) { + /* do not need a zero packet */ + transfer->flags &= ~LIBUSB_TRANSFER_ADD_ZERO_PACKET; + } + /* submit the request */ /* timeouts are unavailable on interrupt endpoints */ if (transferType == kUSBInterrupt) { @@ -1653,11 +1655,18 @@ static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0) usbi_dbg ("an async io operation has completed"); - /* The size should never be larger than 4 GB - Also see libusb bug #117 */ - if ((intptr_t) arg0 > UINT32_MAX) - usbi_err (ITRANSFER_CTX (itransfer), - "async size truncation detected - please report this error"); - size = (UInt32) (intptr_t) arg0; + /* if requested write a zero packet */ + if (kIOReturnSuccess == result && IS_XFEROUT(transfer) && transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) { + struct darwin_interface *cInterface; + uint8_t iface, pipeRef; + + (void) ep_to_pipeRef (transfer->dev_handle, transfer->endpoint, &pipeRef, &iface); + cInterface = &priv->interfaces[iface]; + + (*(cInterface->interface))->WritePipe (cInterface->interface, pipeRef, transfer->buffer, 0); + } + + size = (UInt32) (uintptr_t) arg0; /* send a completion message to the device's file descriptor */ message = MESSAGE_ASYNC_IO_COMPLETE; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 954f310..24dcb35 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10658 +#define LIBUSB_NANO 10659 |