Changeset 104590 in vbox for trunk/src/VBox/Devices/USB/darwin

Timestamp:

May 13, 2024 12:16:21 PM (8 months ago)

Author:

vboxsync

Message:

Devices/USB/darwin/USBProxyDevice-darwin.cpp: Return rc instead of VINF_SUCCESS to catch errors, log if ResetDevice() fails and one additional debug assertion to ensure GetBusFrameNumber() succeeds, bugref:3409

File:

• trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -838 +838 @@
 
     /** @todo sort or hash these for speedy lookup... */
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -1351 +1351 @@
                                 }
                             }
-                            vrc = VERR_VUSB_DEVICE_NOT_ATTACHED;
+                            else
+                                vrc = VERR_VUSB_DEVICE_NOT_ATTACHED;
                         }
                         else
@@ -1437 +1438 @@
 
     IOReturn irc = (*pDevOsX->ppDevI)->ResetDevice(pDevOsX->ppDevI);
+    AssertLogRelMsg(irc == kIOReturnSuccess || irc == kIOReturnNoDevice,
+                    ("USB: ResetDevice -> %#x\n", irc));
 
     irc = (*pDevOsX->ppDevI)->USBDeviceClose(pDevOsX->ppDevI);
@@ -1815 +1818 @@
                 /* try again... */
                 irc = (*pIf->ppIfI)->GetBusFrameNumber(pIf->ppIfI, &FrameNo, &FrameTime);
+                AssertMsg(irc == kIOReturnSuccess, ("GetBusFrameNumber -> %#x\n", irc));
                 if (FrameNo <= pPipe->u64NextFrameNo)
                     FrameNo = pPipe->u64NextFrameNo;