Changeset 206 in vbox

Timestamp:

Jan 21, 2007 10:31:42 AM (18 years ago)

Author:

vboxsync

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

17690

Message:

Init/term R0 runtime.

Location:

trunk/src/VBox/HostDrivers/Support/darwin

Files:

• SUPDrv-darwin.c (modified) (5 diffs)
• load.sh (modified) (1 diff)

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

@@ -1 +1 @@
 /** @file
- *
  * VBox host drivers - Ring-0 support drivers - Darwin host:
  * Darwin driver C code
@@ -25 +24 @@
 *   Header Files                                                               *
 *******************************************************************************/
-/* deal with conflicts first, we ignore any Darwin variants of ALIGN, MAX, MIN, and PVM. */
+/* Deal with conflicts first.
+ * (This is mess inherited from BSD. The *BSDs has clean this up long ago.) */
 #include <sys/param.h>
-#undef ALIGN
-#undef MAX
-#undef MIN
 #undef PVM
 
 #include "SUPDRV.h"
 #include <iprt/types.h>
+#include <iprt/initterm.h>
 #include <iprt/assert.h>
 #include <iprt/spinlock.h>
@@ -126 +124 @@
 
     /*
-     * Initialize the device extension.
-     */
-    rc = supdrvInitDevExt(&g_DevExt);
+     * Initialize IPRT.
+     */
+    rc = RTR0Init(0);
     if (RT_SUCCESS(rc))
     {
         /*
-         * Initialize the session hash table.
+         * Initialize the device extension.
          */
-        memset(g_apSessionHashTab, 0, sizeof(g_apSessionHashTab)); /* paranoia */
-        rc = RTSpinlockCreate(&g_Spinlock);
+        rc = supdrvInitDevExt(&g_DevExt);
         if (RT_SUCCESS(rc))
         {
             /*
-             * Registering ourselves as a character device.
+             * Initialize the session hash table.
              */
-            g_iMajorDeviceNo = cdevsw_add(-1, &g_DevCW);
-            if (g_iMajorDeviceNo >= 0)
+            memset(g_apSessionHashTab, 0, sizeof(g_apSessionHashTab)); /* paranoia */
+            rc = RTSpinlockCreate(&g_Spinlock);
+            if (RT_SUCCESS(rc))
             {
-                g_hDevFsDevice = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
-                                                 UID_ROOT, GID_WHEEL, 0660, DEVICE_NAME); /** @todo the UID and GID should be configurable! */
-                if (g_hDevFsDevice)
+                /*
+                 * Registering ourselves as a character device.
+                 */
+                g_iMajorDeviceNo = cdevsw_add(-1, &g_DevCW);
+                if (g_iMajorDeviceNo >= 0)
                 {
-                    OSDBGPRINT(("VBoxDrv: Successfully started. (major=%d)\n", g_iMajorDeviceNo));
-                    return KMOD_RETURN_SUCCESS;
+                    g_hDevFsDevice = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
+                                                     UID_ROOT, GID_WHEEL, 0660, DEVICE_NAME); /** @todo the UID and GID should be configurable! */
+                    if (g_hDevFsDevice)
+                    {
+                        OSDBGPRINT(("VBoxDrv: Successfully started. (major=%d)\n", g_iMajorDeviceNo));
+                        return KMOD_RETURN_SUCCESS;
+                    }
+
+                    OSDBGPRINT(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n",
+                                g_iMajorDeviceNo, DEVICE_NAME));
+                    cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
+                    g_iMajorDeviceNo = -1;
                 }
-                OSDBGPRINT(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n",
-                            g_iMajorDeviceNo, DEVICE_NAME));
-                cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
-                g_iMajorDeviceNo = -1;
+                else
+                    OSDBGPRINT(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
+                RTSpinlockDestroy(g_Spinlock);
+                g_Spinlock = NIL_RTSPINLOCK;
             }
             else
-                OSDBGPRINT(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
-            RTSpinlockDestroy(g_Spinlock);
-            g_Spinlock = NIL_RTSPINLOCK;
+                OSDBGPRINT(("VBoxDrv: RTSpinlockCreate failed (rc=%d)\n", rc));
+            supdrvDeleteDevExt(&g_DevExt);
         }
         else
-            OSDBGPRINT(("VBoxDrv: RTSpinlockCreate failed (rc=%d)\n", rc));
-        supdrvDeleteDevExt(&g_DevExt);
+            OSDBGPRINT(("VBoxDrv: failed to initialize device extension (rc=%d)\n", rc));
+        RTR0Term();
     }
     else
-        OSDBGPRINT(("VBoxDrv: failed to initialize device extension (rc=%d)\n", rc));
+        OSDBGPRINT(("VBoxDrv: failed to initialize IPRT (rc=%d)\n", rc));
 
     memset(&g_DevExt, 0, sizeof(g_DevExt));
@@ -200 +209 @@
     AssertRC(rc);
     g_Spinlock = NIL_RTSPINLOCK;
+
+    RTR0Term();
 
     memset(&g_DevExt, 0, sizeof(g_DevExt));
@@ -518 +529 @@
 
 
-/** Runtime assert implementation for Linux Ring-0. */
+/** Runtime assert implementation for Darwin Ring-0. */
 RTDECL(void) AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {

trunk/src/VBox/HostDrivers/Support/darwin/load.sh

@@ -12 +12 @@
 fi
 
+trap "sudo chown -R `whoami` $DIR; exit 1" INT
+set -x
 sudo chown -R root:wheel "$DIR"
 sudo chmod -R o-rwx "$DIR"
-sudo kextload -t -v 6 "$DIR"
+sync ; sleep 1; sync
+sudo kextload -t "$DIR"
 sudo chown -R `whoami` "$DIR"
 
+
+