Changeset 16068 in vbox for trunk/src

Timestamp:

Jan 20, 2009 8:31:56 AM (16 years ago)

Author:

vboxsync

Message:

Main: next attempt to get USB enumeration working on RHEL5

Location:

trunk/src/VBox/Main

Files:

• include/vbox-dbus.h (modified) (1 diff)
• linux/HostHardwareLinux.cpp (modified) (13 diffs)

trunk/src/VBox/Main/include/vbox-dbus.h

@@ -69 +69 @@
 
 #define DBUS_ERROR_NO_MEMORY                  "org.freedesktop.DBus.Error.NoMemory"
+#define DBUS_TYPE_INVALID       ((int) '\0')
 #define DBUS_TYPE_STRING        ((int) 's')
 #define DBUS_TYPE_ARRAY         ((int) 'a')

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

@@ -77 +77 @@
 #ifdef VBOX_WITH_DBUS
 /* These must be extern to be usable in the RTMemAutoPtr template */
-extern void halShutdown (DBusConnection *pConnection);
-extern void halShutdownPrivate (DBusConnection *pConnection);
-
-static int halInit(RTMemAutoPtr <DBusConnection, halShutdown> *pConnection);
-static int halInitPrivate(RTMemAutoPtr <DBusConnection, halShutdownPrivate> *pConnection);
+extern void VBoxHalShutdown (DBusConnection *pConnection);
+extern void VBoxHalShutdownPrivate (DBusConnection *pConnection);
+
+static int halInit(RTMemAutoPtr <DBusConnection, VBoxHalShutdown> *pConnection);
+static int halInitPrivate(RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> *pConnection);
 static int halFindDeviceStringMatch (DBusConnection *pConnection,
                                      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,
@@ -212 +213 @@
 #if defined RT_OS_LINUX && defined VBOX_WITH_DBUS
     /** The connection to DBus */
-    RTMemAutoPtr <DBusConnection, halShutdownPrivate> mConnection;
+    RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> mConnection;
     /** Semaphore which is set when a device is hotplugged and reset when
      * it is read. */
@@ -553 +554 @@
  */
 /* static */
-int halInit (RTMemAutoPtr <DBusConnection, halShutdown> *pConnection)
+int halInit (RTMemAutoPtr <DBusConnection, VBoxHalShutdown> *pConnection)
 {
     AssertReturn(VALID_PTR (pConnection), VERR_INVALID_POINTER);
@@ -601 +602 @@
  */
 /* static */
-int halInitPrivate (RTMemAutoPtr <DBusConnection, halShutdownPrivate> *pConnection)
+int halInitPrivate (RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> *pConnection)
 {
     AssertReturn(VALID_PTR (pConnection), VERR_INVALID_POINTER);
@@ -643 +644 @@
  */
 /* static */
-void halShutdown (DBusConnection *pConnection)
+void VBoxHalShutdown (DBusConnection *pConnection)
 {
     AssertReturnVoid(VALID_PTR (pConnection));
@@ -665 +666 @@
  */
 /* static */
-void halShutdownPrivate (DBusConnection *pConnection)
+void VBoxHalShutdownPrivate (DBusConnection *pConnection)
 {
     AssertReturnVoid(VALID_PTR (pConnection));
@@ -733 +734 @@
     dbusError.FlowLog();
     return rc;
+}
+
+/**
+ * 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;
 }
 
@@ -852 +872 @@
 
     RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
-    RTMemAutoPtr <DBusConnection, halShutdown> dbusConnection;
+    RTMemAutoPtr <DBusConnection, VBoxHalShutdown> dbusConnection;
     DBusMessageIter iterFind, iterUdis;
 
@@ -929 +949 @@
 
     RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
-    RTMemAutoPtr <DBusConnection, halShutdown> dbusConnection;
+    RTMemAutoPtr <DBusConnection, VBoxHalShutdown> dbusConnection;
     DBusMessageIter iterFind, iterUdis;
 
@@ -939 +959 @@
         rc = halFindDeviceStringMatch (dbusConnection.get(), "info.subsystem",
                                        "usb_device", &replyFind);
-        if (RT_SUCCESS(rc) && !replyFind)  /* "Old" syntax. */
+        if (RT_SUCCESS(rc) && !dbusMessageIsNonEmptyArray (replyFind.get()))  /* "Old" syntax. */
             rc = halFindDeviceStringMatch (dbusConnection.get(),
                                            "linux.subsystem", "usb_device",
@@ -1014 +1034 @@
 
     RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
-    RTMemAutoPtr <DBusConnection, halShutdown> dbusConnection;
+    RTMemAutoPtr <DBusConnection, VBoxHalShutdown> dbusConnection;
     DBusMessageIter iterFind, iterUdis;
 
@@ -1043 +1063 @@
         const char *pszUdi;
         dbus_message_iter_get_basic (&iterUdis, &pszUdi);
-        static const char *papszKeys[] = { "linux.sysfs_path", "info.subsystem" };
+        static const char *papszKeys[] = { "linux.sysfs_path", "info.subsystem",
+                                           "linux.subsystem" };
         char *papszValues[RT_ELEMENTS (papszKeys)];
         rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
                                     papszKeys, papszValues, &replyGet);
         std::string description;
-        const char *pszSysfsPath = papszValues[0], *pszSubsystem = papszValues[1];
+        const char *pszSysfsPath = papszValues[0], *pszInfoSubsystem = papszValues[1],
+                   *pszLinuxSubsystem = papszValues[2];
         if (!replyGet)
             halSuccess = false;
@@ -1054 +1076 @@
             halSuccess = false;
         if (   halSuccess && RT_SUCCESS (rc)
-            && RTStrCmp (pszSubsystem, "usb_device") != 0)  /* Children of buses can also be devices. */
+            && RTStrCmp (pszInfoSubsystem, "usb_device") != 0  /* Children of buses can also be devices. */
+            && RTStrCmp (pszLinuxSubsystem, "usb_device") != 0)
             pList->push_back (pszSysfsPath);
     }