Changeset 31939 in vbox for trunk

Timestamp:

Aug 24, 2010 7:06:56 PM (14 years ago)

Author:

vboxsync

Message:

VBoxUSB: fixed solaris regression

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp

@@ -101 +101 @@
 
     ASMAtomicIncU32(&g_cUsers);
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_SOLARIS
     /*
      * Check the USBMonitor version.
@@ -131 +130 @@
         return rc;
     }
-#endif
 
     return VINF_SUCCESS;
@@ -192 +190 @@
 
 
-#ifdef VBOX_WITH_NEW_USB_CODE_ON_SOLARIS
 USBLIB_DECL(int) USBLibGetClientInfo(char *pszDeviceIdent, char **ppszClientPath, int *pInstance)
 {
@@ -221 +218 @@
     return rc;
 }
-
-#else
-
-USBLIB_DECL(int) USBLibDeviceInstance(char *pszDevicePath, int *pInstance)
-{
-    LogFlow((USBLIBR3 ":USBLibDeviceInstance pszDevicePath=%s pInstance=%p\n", pszDevicePath, pInstance));
-
-    size_t cbReq = sizeof(VBOXUSBREQ_DEVICE_INSTANCE) + strlen(pszDevicePath);
-    VBOXUSBREQ_DEVICE_INSTANCE *pReq = (VBOXUSBREQ_DEVICE_INSTANCE *)RTMemTmpAllocZ(cbReq);
-    if (RT_UNLIKELY(!pReq))
-        return VERR_NO_MEMORY;
-
-    pReq->pInstance = pInstance;
-    strncpy(pReq->szDevicePath, pszDevicePath, strlen(pszDevicePath));
-
-    int rc = usblibDoIOCtl(VBOXUSBMON_IOCTL_DEVICE_INSTANCE, pReq, cbReq);
-    if (RT_FAILURE(rc))
-        LogRel((USBLIBR3 ":VBOXUSBMON_IOCTL_DEVICE_INSTANCE failed! rc=%Rrc\n", rc));
-
-    RTMemFree(pReq);
-    return rc;
-}
-
-#endif