Changeset 16137 in vbox for trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

Timestamp:

Jan 21, 2009 1:55:57 PM (16 years ago)

Author:

vboxsync

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

41863

Message:

Main: more Linux host USB enumeration adjustments

File:

• trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (modified) (6 diffs)

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -85 +85 @@
                                      const char *pszKey, const char *pszValue,
                                      RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> *pMessage);
-static bool dbusMessageIsNonEmptyArray(DBusMessage *pMessage);
 static int halGetPropertyStrings (DBusConnection *pConnection,
                                   const char *pszUdi, size_t cKeys,
@@ -194 +193 @@
     try
     {
+        bool halSuccess = false;
         mDeviceList.clear();
 #if defined(RT_OS_LINUX)
 #ifdef VBOX_WITH_DBUS
         if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing()))
-            rc = getUSBDeviceInfoFromHal(&mDeviceList, &success);
-        if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing()))
-            rc = getOldUSBDeviceInfoFromHal(&mDeviceList, &success);
+            rc = getUSBDeviceInfoFromHal(&mDeviceList, &halSuccess);
+        /* Try the old API if the new one *succeeded* as only one of them will
+         * pick up devices anyway. */
+        if (RT_SUCCESS (rc) && halSuccess && (!success || testing()))
+            rc = getOldUSBDeviceInfoFromHal(&mDeviceList, &halSuccess);
+        if (!success)
+            success = halSuccess;
 #endif /* VBOX_WITH_DBUS defined */
 #endif /* RT_OS_LINUX */
@@ -740 +744 @@
 
 /**
- * Checks whether a message is a non-empty array or something else.
- * @returns true if it is, false otherwise.
- */
-/* static */
-bool dbusMessageIsNonEmptyArray(DBusMessage *pMessage)
-{
-    bool fSuccess = true;
-    DBusMessageIter iterArray, iterItems;
-    dbus_message_iter_init (pMessage, &iterArray);
-    if (dbus_message_iter_get_arg_type (&iterArray) != DBUS_TYPE_ARRAY)
-        fSuccess = false;
-    if (fSuccess)
-        dbus_message_iter_recurse (&iterArray, &iterItems);
-    if (fSuccess && dbus_message_iter_get_arg_type (&iterItems) == DBUS_TYPE_INVALID)
-        fSuccess = false;
-    return fSuccess;
-}
-
-/**
  * Read a set of string properties for a device.  If some of the properties are
  * not of type DBUS_TYPE_STRING then a NULL pointer will be returned for them.
@@ -988 +973 @@
         rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
                                     papszKeys, papszValues, &replyGet);
-        std::string description;
         const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1];
         /* Get the interfaces. */
@@ -1063 +1047 @@
         const char *pszUdi;
         dbus_message_iter_get_basic (&iterUdis, &pszUdi);
-        static const char *papszKeys[] = { "linux.device_file", "linux.sysfs_path",
-                                           "info.parent" };
+        static const char *papszKeys[] = { "linux.device_file", "info.parent" };
         char *papszValues[RT_ELEMENTS (papszKeys)];
         rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
                                     papszKeys, papszValues, &replyGet);
-        std::string description;
-        const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1],
-                   *pszParent = papszValues[2];
+        const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1];
         /* Get the interfaces. */
         if (!!replyGet && pszDevice && pszSysfsPath)
         {
             USBDeviceInfo info (pszDevice, pszSysfsPath);
-            bool ifaceSuccess = true;  /* If we can't get the interfaces, just
-                                        * skip this one device. */            
-            rc = getUSBInterfacesFromHal (&info.mInterfaces, pszParent, &ifaceSuccess);
+            bool ifaceSuccess = false;  /* If we can't get the interfaces, just
+                                         * skip this one device. */            
+            rc = getUSBInterfacesFromHal (&info.mInterfaces, pszSysfsPath,
+                                          &ifaceSuccess);
             if (RT_SUCCESS(rc) && halSuccess && ifaceSuccess)
                 pList->push_back (info);
@@ -1152 +1134 @@
         rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
                                     papszKeys, papszValues, &replyGet);
-        std::string description;
         const char *pszSysfsPath = papszValues[0], *pszInfoSubsystem = papszValues[1],
                    *pszLinuxSubsystem = papszValues[2];