Changeset 14991 in vbox for trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

Timestamp:

Dec 4, 2008 3:17:33 PM (16 years ago)

Author:

vboxsync

Message:

Main: rework the Linux host drive code to use libdbus-1 directly instead of libhal

File:

• trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp (moved) (moved from trunk/src/VBox/Main/testcase/tstUSBLinux.cpp ) (3 diffs)

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -14 +14 @@
  */
 
-#include "tstUSBLinux.h"
+#ifdef VBOX_USB_WITH_SYSFS
+# include "tstUSBLinux.h"
+#endif
+
+#include <HostHardwareLinux.h>
 
 #include <VBox/err.h>
@@ -27 +31 @@
 {
     RTR3Init();
+#ifdef VBOX_USB_WITH_SYSFS
     USBProxyServiceLinux service;
     service.initSysfs();
@@ -74 +79 @@
         }
     }
+#endif  /* VBOX_USB_WITH_SYSFS */
+    VBoxMainDriveInfo driveInfo;
+    g_testHostHardwareLinux = true;
+    int rc = driveInfo.updateFloppies();
+    if (RT_SUCCESS (rc))
+        rc = driveInfo.updateDVDs();
+    if (RT_FAILURE (rc))
+    {
+        RTPrintf("Failed to update the host drive information, error %Rrc\n",
+                 rc);
+        return 1;
+    }
+    RTPrintf ("Listing floppy drives detected:\n");
+    for (VBoxMainDriveInfo::DriveInfoList::const_iterator it = driveInfo.FloppyBegin();
+         it != driveInfo.FloppyEnd(); ++it)
+    {
+        RTPrintf ("  device: %s", it->mDevice.c_str());
+        if (!it->mUdi.empty())
+            RTPrintf (", udi: %s", it->mUdi.c_str());
+        if (!it->mDescription.empty())
+            RTPrintf (", description: %s", it->mDescription.c_str());
+        RTPrintf ("\n");
+    }
+    RTPrintf ("Listing DVD drives detected:\n");
+    for (VBoxMainDriveInfo::DriveInfoList::const_iterator it = driveInfo.DVDBegin();
+         it != driveInfo.DVDEnd(); ++it)
+    {
+        RTPrintf ("  device: %s", it->mDevice.c_str());
+        if (!it->mUdi.empty())
+            RTPrintf (", udi: %s", it->mUdi.c_str());
+        if (!it->mDescription.empty())
+            RTPrintf (", description: %s", it->mDescription.c_str());
+        RTPrintf ("\n");
+    }
     return 0;
 }