Changeset 25465 in vbox for trunk/src/VBox/HostDrivers/Support/freebsd

Timestamp:

Dec 17, 2009 2:49:34 PM (15 years ago)

Author:

vboxsync

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

56131

Message:

SUPDrv,++: Made SUPDrv.c platform agnostic and renamed SUPDrvAgnostic.c to SUPDrvSem.c. dprintf and dprintf2 are no more (Log/Log2), while OSDBGPRINT simply calls SUPR0Printf.

Location:

trunk/src/VBox/HostDrivers/Support/freebsd

Files:

• Makefile (modified) (1 diff)
• SUPDrv-freebsd.c (modified) (16 diffs)
• files_vboxdrv (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/freebsd/Makefile

@@ -42 +42 @@
 SRCS = \
         SUPDrv.c \
-        SUPDrvAgnostic.c \
+        SUPDrvSem.c \
 
 # Include needed interface headers so they are created during build

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

@@ -159 +159 @@
 static int VBoxDrvFreeBSDLoad(void)
 {
-    dprintf(("VBoxDrvFreeBSDLoad:\n"));
-
     g_cUsers = 0;
 
@@ -169 +167 @@
     if (RT_SUCCESS(rc))
     {
+        Log(("VBoxDrvFreeBSDLoad:\n"));
+
         /*
          * Initialize the device extension.
@@ -182 +182 @@
             if (g_VBoxDrvFreeBSDEHTag)
             {
-                dprintf(("VBoxDrvFreeBSDLoad: returns successfully\n"));
+                Log(("VBoxDrvFreeBSDLoad: returns successfully\n"));
                 return VINF_SUCCESS;
             }
@@ -188 +188 @@
             printf("vboxdrv: EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
             clone_cleanup(&g_pVBoxDrvFreeBSDClones);
-            rc = SUPDRV_ERR_ALREADY_LOADED;
+            rc = VERR_ALREADY_LOADED;
             supdrvDeleteDevExt(&g_VBoxDrvFreeBSDDevExt);
         }
@@ -202 +202 @@
 static int VBoxDrvFreeBSDUnload(void)
 {
-    dprintf(("VBoxDrvFreeBSDUnload:\n"));
+    Log(("VBoxDrvFreeBSDUnload:\n"));
 
     if (g_cUsers > 0)
@@ -219 +219 @@
     memset(&g_VBoxDrvFreeBSDDevExt, 0, sizeof(g_VBoxDrvFreeBSDDevExt));
 
-    dprintf(("VBoxDrvFreeBSDUnload: returns\n"));
+    Log(("VBoxDrvFreeBSDUnload: returns\n"));
     return VINF_SUCCESS;
 }
@@ -232 +232 @@
     int rc;
 
-    dprintf(("VBoxDrvFreeBSDClone: pszName=%s ppDev=%p\n", pszName, ppDev));
+    Log(("VBoxDrvFreeBSDClone: pszName=%s ppDev=%p\n", pszName, ppDev));
 
     /*
@@ -244 +244 @@
     if (iUnit >= 256 || iUnit < 0)
     {
-        dprintf(("VBoxDrvFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
+        Log(("VBoxDrvFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
         return;
     }
 
-    dprintf(("VBoxDrvFreeBSDClone: pszName=%s iUnit=%d\n", pszName, iUnit));
+    Log(("VBoxDrvFreeBSDClone: pszName=%s iUnit=%d\n", pszName, iUnit));
 
     rc = clone_create(&g_pVBoxDrvFreeBSDClones, &g_VBoxDrvFreeBSDChrDevSW, &iUnit, ppDev, 0);
-    dprintf(("VBoxDrvFreeBSDClone: clone_create -> %d; iUnit=%d\n", rc, iUnit));
+    Log(("VBoxDrvFreeBSDClone: clone_create -> %d; iUnit=%d\n", rc, iUnit));
     if (rc)
     {
@@ -263 +263 @@
             dev_ref(*ppDev);
             (*ppDev)->si_flags |= SI_CHEAPCLONE;
-            dprintf(("VBoxDrvFreeBSDClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-                     *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
+            Log(("VBoxDrvFreeBSDClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
+                 *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
             (*ppDev)->si_drv1 = (*ppDev)->si_drv2 = NULL;
         }
@@ -271 +271 @@
     }
     else
-        dprintf(("VBoxDrvFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-                 *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
+        Log(("VBoxDrvFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
+             *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
 }
 
@@ -297 +297 @@
 
 #if __FreeBSD_version < 800062
-    dprintf(("VBoxDrvFreeBSDOpen: fOpen=%#x iUnit=%d\n", fOpen, minor2unit(minor(pDev))));
+    Log(("VBoxDrvFreeBSDOpen: fOpen=%#x iUnit=%d\n", fOpen, minor2unit(minor(pDev))));
 #else
-    dprintf(("VBoxDrvFreeBSDOpen: fOpen=%#x iUnit=%d\n", fOpen, minor(dev2udev(pDev))));
+    Log(("VBoxDrvFreeBSDOpen: fOpen=%#x iUnit=%d\n", fOpen, minor(dev2udev(pDev))));
 #endif
 
@@ -307 +307 @@
     if (fOpen != (FREAD|FWRITE /*=O_RDWR*/))
     {
-        dprintf(("VBoxDrvFreeBSDOpen: fOpen=%#x expected %#x\n", fOpen, O_RDWR));
+        Log(("VBoxDrvFreeBSDOpen: fOpen=%#x expected %#x\n", fOpen, O_RDWR));
         return EINVAL;
     }
@@ -353 +353 @@
     PSUPDRVSESSION pSession = (PSUPDRVSESSION)pDev->si_drv1;
 #if __FreeBSD_version < 800062
-    dprintf(("VBoxDrvFreeBSDClose: fFile=%#x iUnit=%d pSession=%p\n", fFile, minor2unit(minor(pDev)), pSession));
+    Log(("VBoxDrvFreeBSDClose: fFile=%#x iUnit=%d pSession=%p\n", fFile, minor2unit(minor(pDev)), pSession));
 #else
-    dprintf(("VBoxDrvFreeBSDClose: fFile=%#x iUnit=%d pSession=%p\n", fFile, minor(dev2udev(pDev)), pSession));
+    Log(("VBoxDrvFreeBSDClose: fFile=%#x iUnit=%d pSession=%p\n", fFile, minor(dev2udev(pDev)), pSession));
 #endif
 
@@ -496 +496 @@
     else
     {
-        dprintf(("VBoxDrvFreeBSDIOCtlSlow: huh? cbReq=%#x ulCmd=%#lx\n", cbReq, ulCmd));
+        Log(("VBoxDrvFreeBSDIOCtlSlow: huh? cbReq=%#x ulCmd=%#lx\n", cbReq, ulCmd));
         return EINVAL;
     }
@@ -521 +521 @@
                 OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: copyout(%p,%p,%#x) -> %d; uCmd=%#lx!\n", pHdr, pvUser, cbOut, rc, ulCmd));
 
-            dprintf(("VBoxDrvFreeBSDIOCtlSlow: returns %d / %d ulCmd=%lx\n", 0, pHdr->rc, ulCmd));
+            Log(("VBoxDrvFreeBSDIOCtlSlow: returns %d / %d ulCmd=%lx\n", 0, pHdr->rc, ulCmd));
 
             /* cleanup */
@@ -535 +535 @@
             RTMemTmpFree(pHdr);
 
-        dprintf(("VBoxDrvFreeBSDIOCtlSlow: ulCmd=%lx pData=%p failed, rc=%d\n", ulCmd, pvData, rc));
+        Log(("VBoxDrvFreeBSDIOCtlSlow: ulCmd=%lx pData=%p failed, rc=%d\n", ulCmd, pvData, rc));
         rc = EINVAL;
     }

trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv

@@ -77 +77 @@
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c=>freebsd/SUPDrv-freebsd.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.c=>SUPDrv.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvAgnostic.c=>SUPDrvAgnostic.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvSem.c=>SUPDrvSem.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvIDC.h=>SUPDrvIDC.h \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvIOC.h=>SUPDrvIOC.h \