Changeset 57990 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Oct 1, 2015 5:53:32 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103011

Message:

Removed the 'temporary' VBOX_WITH_NEW_USB_CODE_ON_DARWIN define (r29740, 7 years ago).

File:

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

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

@@ -1184 +1184 @@
     }
 
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     /*
      * Call the USBLib init to make sure we're a valid VBoxUSB client.
@@ -1192 +1191 @@
     if (RT_FAILURE(vrc))
         LogRel(("USB: USBLibInit failed - %Rrc\n", vrc));
-#endif
 
     /*
@@ -1330 +1328 @@
     }
 
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     USBLibTerm();
-#endif
     return vrc;
 }
@@ -1379 +1375 @@
 
     IOReturn irc = (*pDevOsX->ppDevI)->ResetDevice(pDevOsX->ppDevI);
-#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    if (irc == kIOReturnSuccess)
-        irc = (*pDevOsX->ppDevI)->USBDeviceReEnumerate(pDevOsX->ppDevI, 0);
-#endif
 
     irc = (*pDevOsX->ppDevI)->USBDeviceClose(pDevOsX->ppDevI);
@@ -1409 +1401 @@
     }
 
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     USBLibTerm();
-#endif
     LogFlow(("usbProxyDarwinClose: returns\n"));
 }