RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-07-21 08:36:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

OS X: Don't assume an interval of 1

Browse Source
This commit is contained in:
Nathan Hjelm
2013-04-03 04:12:47 -06:00
committed by Pete Batard
parent cf8506faf4
commit 2ffefc0476
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libusb/os/darwin_usb.c
+17 -9
View File
@@ -1385,11 +1385,12 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) {
struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv;
IOReturn kresult;
uint8_t pipeRef, iface;
UInt64 frame;
AbsoluteTime atTime;
int i;
IOReturn kresult;
uint8_t direction, number, interval, pipeRef, iface, transferType;
uint16_t maxPacketSize;
UInt64 frame;
AbsoluteTime atTime;
int i;
struct darwin_interface *cInterface;
@@ -1429,6 +1430,14 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) {
return darwin_to_libusb (kresult);
}
(*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
&transferType, &maxPacketSize, &interval);
/* work around buggy devices */
if (0 == interval) {
interval = 9;
}
/* schedule for a frame a little in the future */
frame += 4;
@@ -1445,10 +1454,9 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) {
transfer->num_iso_packets, tpriv->isoc_framelist, darwin_async_io_callback,
itransfer);
if (transfer->dev_handle->dev->speed == LIBUSB_SPEED_FULL)
cInterface->frames[transfer->endpoint] = frame + transfer->num_iso_packets;
else
cInterface->frames[transfer->endpoint] = frame + transfer->num_iso_packets / 8;
cInterface->frames[transfer->endpoint] = frame + transfer->num_iso_packets * (1 << (interval - 1));
if (transfer->dev_handle->dev->speed >= LIBUSB_SPEED_HIGH)
cInterface->frames[transfer->endpoint] /= 8;
if (kresult != kIOReturnSuccess) {
usbi_err (TRANSFER_CTX (transfer), "isochronous transfer failed (dir: %s): %s", IS_XFERIN(transfer) ? "In" : "Out",
libusb/version_nano.h
+1 -1
View File
@@ -1 +1 @@
#define LIBUSB_NANO 10636
#define LIBUSB_NANO 10637