Changeset 21948 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Aug 3, 2009 4:59:09 PM (16 years ago)

Author:

vboxsync

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

50635

Message:

Solaris/vboxdrv,vboxnet,vboxusbmon: fixed dependencies to vboxdrv.

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/SUPDrv.c (modified) (3 diffs)
• VBoxNetAdp/Makefile.kmk (modified) (1 diff)
• VBoxNetAdp/solaris/VBoxNetAdp-solaris.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -54 +54 @@
 # include <iprt/net.h>
 # include <iprt/string.h>
+# include <iprt/rand.h>
+# include <iprt/path.h>
 #endif
 /* VBox/x86.h not compatible with the Linux kernel sources */
@@ -480 +482 @@
 PFNRT g_apfnVBoxDrvIPRTDeps[] =
 {
+    /* VBoxNetFlt */
     (PFNRT)RTCrc32,
     (PFNRT)RTErrConvertFromErrno,
@@ -490 +493 @@
     (PFNRT)RTStrDup,
     (PFNRT)RTStrFree,
+    /* VBoxNetAdp */
+    (PFNRT)RTRandBytes,
+    /* VBoxUSB */
+    (PFNRT)RTPathStripFilename,
     NULL
 };

trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

@@ -55 +55 @@
 #VBoxNetAdp_SOURCES          = \
 #       VBoxNetAdp.c
-VBoxNetAdp_LIBS.solaris    += \
-        $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
 VBoxNetAdp_LIBS            += \
         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)

trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c

@@ -234 +234 @@
     if (RT_SUCCESS(rc))
     {
-        /*
-         * Create the release logger instance.
-         */
-        static const char *const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-        PRTLOGGER pRelLogger;
-        rc = RTLogCreate(&pRelLogger, 0 /* fFlags */, "all", "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups,
-                        RTLOGDEST_STDOUT | RTLOGDEST_DEBUGGER, NULL);
-        if (RT_SUCCESS(rc))
-            RTLogRelSetDefaultInstance(pRelLogger);
-
         rc = mod_install(&g_VBoxNetAdpSolarisModLinkage);
         if (!rc)
@@ -249 +239 @@
 
         LogRel((DEVICE_NAME ":mod_install failed. rc=%d\n", rc));
-        RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
-        RTLogDestroy(RTLogSetDefaultInstance(NULL));
         RTR0Term();
     }
@@ -268 +256 @@
      * Undo the work done during start (in reverse order).
      */
-    RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
-    RTLogDestroy(RTLogSetDefaultInstance(NULL));
     RTR0Term();