Changeset 56824 in vbox for trunk

Timestamp:

Jul 6, 2015 4:57:17 PM (10 years ago)

Author:

vboxsync

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

101475

Message:

Revert r101473 because the build issues under linux.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/HostUSBDeviceImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -453 +453 @@
         src-server/USBDeviceFilterImpl.cpp \
         src-server/USBProxyService.cpp \
-        src-server/HostUSBDeviceImpl.cpp\
-        src-server/USBDevAliases.cpp
+        src-server/HostUSBDeviceImpl.cpp
  VBoxSVC_SOURCES.darwin  +=  src-server/darwin/USBProxyServiceDarwin.cpp
  VBoxSVC_SOURCES.linux   +=   src-server/linux/USBProxyServiceLinux.cpp

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2015 Oracle Corporation
+ * Copyright (C) 2005-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include <VBox/err.h>
 #include <iprt/cpp/utils.h>
-#include "USBDevAliases.h"
 
 // constructor / destructor
@@ -168 +167 @@
 
     aManufacturer = mUsb->pszManufacturer;
-    if (mUsb->pszManufacturer == NULL || mUsb->pszManufacturer[0] == 0)
-    {
-        USBNameAlias* alias = USBDevTableAdapter::findAlias(mUsb->idVendor, mUsb->idProduct);
-        if (alias != NULL)
-        {
-            aManufacturer = alias->vendor;
-        }
-    }
+
     return S_OK;
 }
@@ -185 +177 @@
 
     aProduct = mUsb->pszProduct;
-    if (mUsb->pszProduct == NULL || mUsb->pszProduct[0]== 0)
-    {
-        USBNameAlias* alias = USBDevTableAdapter::findAlias(mUsb->idVendor, mUsb->idProduct);
-        if (alias != NULL)
-        {
-            aProduct = alias->product;
-        }
-    }
+
     return S_OK;
 }
@@ -343 +328 @@
         name = Utf8StrFmt("%s", mUsb->pszProduct);
     else
-    {
-        USBNameAlias* alias = USBDevTableAdapter::findAlias(mUsb->idVendor, mUsb->idProduct);
-        if (alias == NULL)
-        {
-            name = "<unknown>";
-            LogRel(("USB: Unknown USB device detected ( idVendor: 0x%04x, idProduct: 0x%04x ). \
-                    Please, report the idVendor and idProduct to vbox.org.\n", mUsb->idVendor, mUsb->idProduct));
-        }
-        else
-        {
-            name = Utf8StrFmt("%s %s", alias->vendor, alias->product);
-        }
-    }
+        name = "<unknown>";
+
     return name;
 }