Changeset 23537 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 4, 2009 2:21:08 PM (16 years ago)

Author:

vboxsync

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

53180

Message:

FreeBSD: Bye bye HAL. We use the CAM layer directly to discover CD/DVD devices now

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (7 diffs)
• Makefile.kmk (modified) (1 diff)
• freebsd/HostHardwareFreeBSD.cpp (added)
• include/HostImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -32 +32 @@
 #include "HostPower.h"
 
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 # include <HostHardwareLinux.h>
 #endif
@@ -94 +94 @@
 #endif /* RT_OS_WINDOWS */
 
-#ifdef RT_OS_FREEBSD
-# ifdef VBOX_USE_LIBHAL
-#  include "vbox-libhal.h"
-# endif
-#endif
-
 #include "HostImpl.h"
 #include "HostNetworkInterfaceImpl.h"
@@ -168 +162 @@
 #endif /* VBOX_WITH_USB */
 
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
     /** Object with information about host drives */
     VBoxMainDriveInfo       hostDrives;
@@ -445 +439 @@
         }
 
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
         if (RT_SUCCESS(m->hostDrives.updateDVDs()))
             for (DriveInfoList::const_iterator it = m->hostDrives.DVDBegin();
@@ -473 +467 @@
             cur = cur->pNext;
             RTMemFree(freeMe);
-        }
-#elif defined(RT_OS_FREEBSD)
-# ifdef VBOX_USE_LIBHAL
-        if (!getDVDInfoFromHal(list))
-# endif
-        {
-            /** @todo: Scan for accessible /dev/cd* devices. */
         }
 #else
@@ -1779 +1766 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#if (defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)) && defined(VBOX_USE_LIBHAL)
-/* Solaris and FreeBSD hosts, loading libhal at runtime */
+#if defined(RT_OS_SOLARIS) && defined(VBOX_USE_LIBHAL)
+/* Solaris hosts, loading libhal at runtime */
 
 /**
@@ -1824 +1811 @@
                             gLibHalFreeString(devNode);
                             devNode = tmp;
-#endif
-
-#ifdef RT_OS_FREEBSD
-                            /*
-                             * Don't show devices handled by the 'acd' driver.
-                             * The ioctls don't work with it.
-                             */
-                            char *driverName = gLibHalDeviceGetPropertyString(halContext,
-                                                       halDevices[i], "freebsd.driver", &dbusError);
-                            if (driverName)
-                            {
-                                if (RTStrCmp(driverName, "acd") == 0)
-                                {
-                                    gLibHalFreeString(devNode);
-                                    devNode = NULL;
-                                }
-                                gLibHalFreeString(driverName);
-                            }
 #endif
 

trunk/src/VBox/Main/Makefile.kmk

@@ -345 +345 @@
 
 VBoxSVC_SOURCES.freebsd = \
-        linux/vbox-libhal.cpp
+        freebsd/HostHardwareFreeBSD.cpp
 
 ifdef VBOX_WITH_USB

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

@@ -123 +123 @@
 private:
 
-#if (defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)) && defined(VBOX_USE_LIBHAL)
+#if defined(RT_OS_SOLARIS) && defined(VBOX_USE_LIBHAL)
     bool getDVDInfoFromHal(std::list< ComObjPtr<Medium> > &list);
     bool getFloppyInfoFromHal(std::list< ComObjPtr<Medium> > &list);