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

Timestamp:

Jan 22, 2021 7:22:03 PM (4 years ago)

Author:

vboxsync

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

142364

Message:

USB/Darwin: Capture USB devices directly through IOUSBLib, no longer use VBoxUSB.kext (see bugref:9808).

Location:

trunk/src/VBox/Main/src-server/darwin

Files:

• USBProxyBackendDarwin.cpp (modified) (5 diffs)
• iokit.cpp (modified) (1 diff)

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

@@ -41 +41 @@
  */
 USBProxyBackendDarwin::USBProxyBackendDarwin()
-    : USBProxyBackend(), mServiceRunLoopRef(NULL), mNotifyOpaque(NULL), mWaitABitNextTime(false), mUSBLibInitialized(false)
+    : USBProxyBackend(), mServiceRunLoopRef(NULL), mNotifyOpaque(NULL), mWaitABitNextTime(false)
 {
 }
@@ -60 +60 @@
 
     unconst(m_strBackend) = Utf8Str("host");
-
-    /*
-     * Initialize the USB library.
-     */
-    int rc = USBLibInit();
-    if (RT_FAILURE(rc))
-        return rc;
-
-    mUSBLibInitialized = true;
 
     /*
@@ -91 +82 @@
         stop();
 
-    /*
-     * Terminate the USB library - it'll
-     */
-    if (mUSBLibInitialized)
-    {
-        USBLibTerm();
-        mUSBLibInitialized = false;
-    }
-
     USBProxyBackend::uninit();
-}
-
-
-void *USBProxyBackendDarwin::insertFilter(PCUSBFILTER aFilter)
-{
-    return USBLibAddFilter(aFilter);
-}
-
-
-void USBProxyBackendDarwin::removeFilter(void *aId)
-{
-    USBLibRemoveFilter(aId);
 }
 
@@ -129 +99 @@
     Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_Capturing);
 
-    /*
-     * Create a one-shot capture filter for the device (don't
-     * match on port) and trigger a re-enumeration of it.
-     */
-    USBFILTER Filter;
-    USBFilterInit(&Filter, USBFILTERTYPE_ONESHOT_CAPTURE);
-    initFilterFromDevice(&Filter, aDevice);
-
-    void *pvId = USBLibAddFilter(&Filter);
-    if (!pvId)
-        return VERR_GENERAL_FAILURE;
-
-    int rc = DarwinReEnumerateUSBDevice(aDevice->i_getUsbData());
-    if (RT_SUCCESS(rc))
-        aDevice->i_setBackendUserData(pvId);
-    else
-    {
-        USBLibRemoveFilter(pvId);
-        pvId = NULL;
-    }
-    LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
-    return rc;
-}
-
-
-void USBProxyBackendDarwin::captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess)
-{
-    AssertReturnVoid(aDevice->isWriteLockOnCurrentThread());
-
-    /*
-     * Remove the one-shot filter if necessary.
-     */
-    LogFlowThisFunc(("aDevice=%s aSuccess=%RTbool mOneShotId=%p\n", aDevice->i_getName().c_str(), aSuccess, aDevice->i_getBackendUserData()));
-    if (!aSuccess && aDevice->i_getBackendUserData())
-        USBLibRemoveFilter(aDevice->i_getBackendUserData());
-    aDevice->i_setBackendUserData(NULL);
-    USBProxyBackend::captureDeviceCompleted(aDevice, aSuccess);
+    devLock.release();
+    interruptWait();
+    return VINF_SUCCESS;
 }
 
@@ -182 +118 @@
     Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_ReleasingToHost);
 
-    /*
-     * Create a one-shot ignore filter for the device
-     * and trigger a re-enumeration of it.
-     */
-    USBFILTER Filter;
-    USBFilterInit(&Filter, USBFILTERTYPE_ONESHOT_IGNORE);
-    initFilterFromDevice(&Filter, aDevice);
-    Log(("USBFILTERIDX_PORT=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_PORT)));
-    Log(("USBFILTERIDX_BUS=%#x\n", USBFilterGetNum(&Filter, USBFILTERIDX_BUS)));
-
-    void *pvId = USBLibAddFilter(&Filter);
-    if (!pvId)
-        return VERR_GENERAL_FAILURE;
-
-    int rc = DarwinReEnumerateUSBDevice(aDevice->i_getUsbData());
-    if (RT_SUCCESS(rc))
-        aDevice->i_setBackendUserData(pvId);
-    else
-    {
-        USBLibRemoveFilter(pvId);
-        pvId = NULL;
-    }
-    LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
-    return rc;
+    devLock.release();
+    interruptWait();
+    return VINF_SUCCESS;
 }
 
 
-void USBProxyBackendDarwin::releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess)
-{
-    AssertReturnVoid(aDevice->isWriteLockOnCurrentThread());
-
-    /*
-     * Remove the one-shot filter if necessary.
-     */
-    LogFlowThisFunc(("aDevice=%s aSuccess=%RTbool mOneShotId=%p\n", aDevice->i_getName().c_str(), aSuccess, aDevice->i_getBackendUserData()));
-    if (!aSuccess && aDevice->i_getBackendUserData())
-        USBLibRemoveFilter(aDevice->i_getBackendUserData());
-    aDevice->i_setBackendUserData(NULL);
-    USBProxyBackend::releaseDeviceCompleted(aDevice, aSuccess);
-}
-
-
-/**
- * Returns whether devices reported by this backend go through a de/re-attach
- * and device re-enumeration cycle when they are captured or released.
- */
-bool USBProxyBackendDarwin::i_isDevReEnumerationRequired()
+bool USBProxyBackendDarwin::isFakeUpdateRequired()
 {
     return true;

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

@@ -1276 +1276 @@
 
     return pHead;
-}
-
-
-/**
- * Triggers re-enumeration of a device.
- *
- * @returns VBox status code.
- * @param   pCur    The USBDEVICE structure for the device.
- */
-int DarwinReEnumerateUSBDevice(PCUSBDEVICE pCur)
-{
-    int vrc;
-    const char *pszAddress = pCur->pszAddress;
-    AssertPtrReturn(pszAddress, VERR_INVALID_POINTER);
-    AssertReturn(darwinOpenMasterPort(), VERR_GENERAL_FAILURE);
-
-    /*
-     * This code is a short version of the Open method in USBProxyDevice-darwin.cpp stuff.
-     * Fixes made to this code probably applies there too!
-     */
-
-    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching(kIOUSBDeviceClassName);
-    AssertReturn(RefMatchingDict, VERR_INTERNAL_ERROR_4);
-
-    uint64_t u64SessionId = 0;
-    uint32_t u32LocationId = 0;
-    const char *psz = pszAddress;
-    do
-    {
-        const char chValue = *psz;
-        AssertReleaseReturn(psz[1] == '=', VERR_INTERNAL_ERROR);
-        uint64_t u64Value;
-        int rc = RTStrToUInt64Ex(psz + 2, (char **)&psz, 0, &u64Value);
-        AssertReleaseRCReturn(rc, rc);
-        AssertReleaseReturn(!*psz || *psz == ';', rc);
-        switch (chValue)
-        {
-            case 'l':
-                u32LocationId = (uint32_t)u64Value;
-                break;
-            case 's':
-                u64SessionId = u64Value;
-                break;
-            case 'p':
-            case 'v':
-            {
-#if 0 /* Guess what, this doesn't 'ing work either! */
-                SInt32 i32 = (int16_t)u64Value;
-                CFNumberRef Num = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &i32);
-                AssertBreak(Num);
-                CFDictionarySetValue(RefMatchingDict, chValue == 'p' ? CFSTR(kUSBProductID) : CFSTR(kUSBVendorID), Num);
-                CFRelease(Num);
-#endif
-                break;
-            }
-            default:
-                AssertReleaseMsgFailedReturn(("chValue=%#x\n", chValue), VERR_INTERNAL_ERROR);
-        }
-        if (*psz == ';')
-            psz++;
-    } while (*psz);
-
-    io_iterator_t USBDevices = IO_OBJECT_NULL;
-    IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &USBDevices);
-    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%#x\n", irc), VERR_INTERNAL_ERROR_5);
-    RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
-
-    unsigned cMatches = 0;
-    io_object_t USBDevice;
-    while ((USBDevice = IOIteratorNext(USBDevices)) != IO_OBJECT_NULL)
-    {
-        cMatches++;
-        CFMutableDictionaryRef PropsRef = 0;
-        kern_return_t krc = IORegistryEntryCreateCFProperties(USBDevice, &PropsRef, kCFAllocatorDefault, kNilOptions);
-        if (krc == KERN_SUCCESS)
-        {
-            uint64_t u64CurSessionId;
-            uint32_t u32CurLocationId;
-            if (    (    !u64SessionId
-                     || (   darwinDictGetU64(PropsRef, CFSTR("sessionID"), &u64CurSessionId)
-                         && u64CurSessionId == u64SessionId))
-                &&  (   !u32LocationId
-                     || (   darwinDictGetU32(PropsRef, CFSTR(kUSBDevicePropertyLocationID), &u32CurLocationId)
-                         && u32CurLocationId == u32LocationId))
-                )
-            {
-                CFRelease(PropsRef);
-                break;
-            }
-            CFRelease(PropsRef);
-        }
-        IOObjectRelease(USBDevice);
-    }
-    IOObjectRelease(USBDevices);
-    USBDevices = IO_OBJECT_NULL;
-    if (!USBDevice)
-    {
-        LogRel(("USB: Device '%s' not found (%d pid+vid matches)\n", pszAddress, cMatches));
-        IOObjectRelease(USBDevices);
-        return VERR_VUSB_DEVICE_NAME_NOT_FOUND;
-    }
-
-    /*
-     * Create a plugin interface for the device and query its IOUSBDeviceInterface.
-     */
-    SInt32 Score = 0;
-    IOCFPlugInInterface **ppPlugInInterface = NULL;
-    irc = IOCreatePlugInInterfaceForService(USBDevice, kIOUSBDeviceUserClientTypeID,
-                                            kIOCFPlugInInterfaceID, &ppPlugInInterface, &Score);
-    if (irc == kIOReturnSuccess)
-    {
-        IOUSBDeviceInterface245 **ppDevI = NULL;
-        HRESULT hrc = (*ppPlugInInterface)->QueryInterface(ppPlugInInterface,
-                                                           CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID245),
-                                                           (LPVOID *)&ppDevI);
-        irc = IODestroyPlugInInterface(ppPlugInInterface); Assert(irc == kIOReturnSuccess);
-        ppPlugInInterface = NULL;
-        if (hrc == S_OK)
-        {
-            /*
-             * Try open the device for exclusive access.
-             */
-            irc = (*ppDevI)->USBDeviceOpenSeize(ppDevI);
-            if (irc == kIOReturnExclusiveAccess)
-            {
-                RTThreadSleep(20);
-                irc = (*ppDevI)->USBDeviceOpenSeize(ppDevI);
-            }
-            if (irc == kIOReturnSuccess)
-            {
-                /*
-                 * Re-enumerate the device and bail out.
-                 */
-                irc = (*ppDevI)->USBDeviceReEnumerate(ppDevI, 0);
-                if (irc == kIOReturnSuccess)
-                    vrc = VINF_SUCCESS;
-                else
-                {
-                    LogRel(("USB: Failed to open device '%s', plug-in creation failed with irc=%#x.\n", pszAddress, irc));
-                    vrc = RTErrConvertFromDarwinIO(irc);
-                }
-
-                (*ppDevI)->USBDeviceClose(ppDevI);
-            }
-            else if (irc == kIOReturnExclusiveAccess)
-            {
-                LogRel(("USB: Device '%s' is being used by another process\n", pszAddress));
-                vrc = VERR_SHARING_VIOLATION;
-            }
-            else
-            {
-                LogRel(("USB: Failed to open device '%s', irc=%#x.\n", pszAddress, irc));
-                vrc = VERR_OPEN_FAILED;
-            }
-        }
-        else
-        {
-            LogRel(("USB: Failed to create plugin interface for device '%s', hrc=%#x.\n", pszAddress, hrc));
-            vrc = VERR_OPEN_FAILED;
-        }
-
-        (*ppDevI)->Release(ppDevI);
-    }
-    else
-    {
-        LogRel(("USB: Failed to open device '%s', plug-in creation failed with irc=%#x.\n", pszAddress, irc));
-        vrc = RTErrConvertFromDarwinIO(irc);
-    }
-
-    return vrc;
 }