Changeset 14991 in vbox for trunk/src/VBox/Main/include

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

Location:

trunk/src/VBox/Main/include

Files:

• HostHardwareLinux.h (added)
• HostImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/include/HostImpl.h

@@ -36 +36 @@
 #ifdef RT_OS_WINDOWS
 # include "win/svchlp.h"
+#endif
+
+#ifdef RT_OS_LINUX
+# include <HostHardwareLinux.h>
 #endif
 
@@ -132 +136 @@
 private:
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
-# if defined(VBOX_WITH_LIBHAL) || defined(VBOX_USE_LIBHAL)
+#if defined(RT_OS_SOLARIS)
+# if defined(VBOX_USE_LIBHAL)
     bool getDVDInfoFromHal(std::list <ComObjPtr <HostDVDDrive> > &list);
     bool getFloppyInfoFromHal(std::list <ComObjPtr <HostFloppyDrive> > &list);
@@ -178 +182 @@
 #endif /* VBOX_WITH_USB */
 
+#ifdef RT_OS_LINUX
+    /** Object with information about host drives */
+    VBoxMainDriveInfo mHostDrives;
+#endif
     /* Features that can be queried with GetProcessorFeature */
     BOOL fVTxAMDVSupported, fLongModeSupported, fPAESupported;