Changeset 57990 in vbox for trunk/src/VBox/Main/src-server/darwin

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/Main/src-server/darwin/USBProxyServiceDarwin.cpp (modified) (16 diffs)

trunk/src/VBox/Main/src-server/darwin/USBProxyServiceDarwin.cpp

@@ -53 +53 @@
 HRESULT USBProxyServiceDarwin::init(void)
 {
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     /*
      * Initialize the USB library.
@@ -64 +63 @@
     }
     mUSBLibInitialized = true;
-#endif
 
     /*
@@ -87 +85 @@
         stop();
 
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     /*
      * Terminate the USB library - it'll
@@ -96 +93 @@
         mUSBLibInitialized = false;
     }
-#endif
-}
-
-
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+}
+
+
 void *USBProxyServiceDarwin::insertFilter(PCUSBFILTER aFilter)
 {
@@ -111 +106 @@
     USBLibRemoveFilter(aId);
 }
-#endif /* VBOX_WITH_NEW_USB_CODE_ON_DARWIN */
 
 
@@ -127 +121 @@
     Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_Capturing);
 
-#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    /*
-     * Fake it.
-     */
-    ASMAtomicWriteBool(&mFakeAsync, true);
-    devLock.release();
-    interruptWait();
-    return VINF_SUCCESS;
-
-#else
     /*
      * Create a one-shot capture filter for the device (don't
@@ -159 +143 @@
     LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
     return rc;
-#endif
 }
 
@@ -166 +149 @@
 {
     AssertReturnVoid(aDevice->isWriteLockOnCurrentThread());
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+
     /*
      * Remove the one-shot filter if necessary.
@@ -174 +157 @@
         USBLibRemoveFilter(aDevice->mOneShotId);
     aDevice->mOneShotId = NULL;
-#endif
 }
 
@@ -191 +173 @@
     Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_ReleasingToHost);
 
-#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    /*
-     * Fake it.
-     */
-    ASMAtomicWriteBool(&mFakeAsync, true);
-    devLock.release();
-    interruptWait();
-    return VINF_SUCCESS;
-
-#else
     /*
      * Create a one-shot ignore filter for the device
@@ -225 +197 @@
     LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
     return rc;
-#endif
 }
 
@@ -232 +203 @@
 {
     AssertReturnVoid(aDevice->isWriteLockOnCurrentThread());
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+
     /*
      * Remove the one-shot filter if necessary.
@@ -240 +211 @@
         USBLibRemoveFilter(aDevice->mOneShotId);
     aDevice->mOneShotId = NULL;
-#endif
 }
 
@@ -247 +217 @@
 void USBProxyServiceDarwin::detachingDevice(HostUSBDevice *aDevice)
 {
-#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    aDevice->setLogicalReconnect(HostUSBDevice::kDetachingPendingDetach);
-#else
     NOREF(aDevice);
-#endif
 }
 
@@ -259 +225 @@
     AssertReturn(aDevice, false);
     AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
-#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    /* We're faking async state stuff. */
-    return updateDeviceStateFake(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
-#else
-    /* Nothing special here so far, so fall back on parent */
+    /* Nothing special here so far, so fall back on parent. */
     return USBProxyService::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
-#endif
 }
 
@@ -271 +232 @@
 int USBProxyServiceDarwin::wait(RTMSINTERVAL aMillies)
 {
-#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    if (    mFakeAsync
-        &&  ASMAtomicXchgBool(&mFakeAsync, false))
-        return VINF_SUCCESS;
-#endif
-
     SInt32 rc = CFRunLoopRunInMode(CFSTR(VBOX_IOKIT_MODE_STRING),
                                    mWaitABitNextTime && aMillies >= 1000