Changeset 9602 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jun 11, 2008 12:09:31 PM (17 years ago)

Author:

vboxsync

Message:

Changed RTR0MpNotificationInit/Term to rtR0MpNotificationInit/Term and dropped the unused pvOS argument. They are now IPRT internal and called by RTR0Init/Term.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• linux/SUPDrv-linux.c (modified) (2 diffs)
• solaris/SUPDrv-solaris.c (modified) (2 diffs)

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

@@ -658 +658 @@
         if (RT_SUCCESS(rc))
         {
-            rc = RTR0MpNotificationInit(NULL);
+#ifdef RT_ARCH_AMD64
+            rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));
+#endif
+            /*
+             * Initialize the device extension.
+             */
             if (RT_SUCCESS(rc))
+                rc = supdrvInitDevExt(&g_DevExt);
+            if (!rc)
             {
-#ifdef RT_ARCH_AMD64
-                rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));
-#endif
+#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
                 /*
-                 * Initialize the device extension.
+                 * Create the GIP page.
                  */
-                if (RT_SUCCESS(rc))
-                    rc = supdrvInitDevExt(&g_DevExt);
+                rc = VBoxDrvLinuxInitGip(&g_DevExt);
                 if (!rc)
+#endif /* !USE_NEW_OS_INTERFACE_FOR_GIP */
                 {
-#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
-                    /*
-                     * Create the GIP page.
-                     */
-                    rc = VBoxDrvLinuxInitGip(&g_DevExt);
-                    if (!rc)
-#endif /* !USE_NEW_OS_INTERFACE_FOR_GIP */
-                    {
-                        printk(KERN_INFO DEVICE_NAME ": TSC mode is %s, kernel timer mode is "
+                    printk(KERN_INFO DEVICE_NAME ": TSC mode is %s, kernel timer mode is "
 #ifdef VBOX_HRTIMER
-                               "'high-res'"
-#else
-                               "'normal'"
-#endif
-                               ".\n",
-                               g_DevExt.pGip->u32Mode == SUPGIPMODE_SYNC_TSC ? "'synchronous'" : "'asynchronous'");
-                        LogFlow(("VBoxDrv::ModuleInit returning %#x\n", rc));
-                        printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version "
-                               VBOX_VERSION_STRING " (interface " xstr(SUPDRVIOC_VERSION) ").\n");
-                        return rc;
-                    }
-
-                    supdrvDeleteDevExt(&g_DevExt);
+                           "'high-res'"
+#else
+                           "'normal'"
+#endif
+                           ".\n",
+                           g_DevExt.pGip->u32Mode == SUPGIPMODE_SYNC_TSC ? "'synchronous'" : "'asynchronous'");
+                    LogFlow(("VBoxDrv::ModuleInit returning %#x\n", rc));
+                    printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version "
+                           VBOX_VERSION_STRING " (interface " xstr(SUPDRVIOC_VERSION) ").\n");
+                    return rc;
                 }
-                else
-                    rc = -EINVAL;
-                RTR0MpNotificationTerm(NULL);
+
+                supdrvDeleteDevExt(&g_DevExt);
             }
+            else
+                rc = -EINVAL;
             RTR0Term();
         }
@@ -758 +753 @@
 #endif /* !USE_NEW_OS_INTERFACE_FOR_GIP */
     supdrvDeleteDevExt(&g_DevExt);
-    RTR0MpNotificationTerm(NULL);
     RTR0Term();
 }

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

@@ -263 +263 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTR0MpNotificationInit(NULL);
-                if (RT_SUCCESS(rc)) 
+                /*
+                 * Initialize the device extension
+                 */
+                rc = supdrvInitDevExt(&g_DevExt);
+                if (RT_SUCCESS(rc))
                 {
                     /*
-                     * Initialize the device extension
+                     * Initialize the session hash table.
                      */
-                    rc = supdrvInitDevExt(&g_DevExt);
+                    memset(g_apSessionHashTab, 0, sizeof(g_apSessionHashTab));
+                    rc = RTSpinlockCreate(&g_Spinlock);
                     if (RT_SUCCESS(rc))
                     {
                         /*
-                         * Initialize the session hash table.
+                         * Register ourselves as a character device, pseudo-driver
                          */
-                        memset(g_apSessionHashTab, 0, sizeof(g_apSessionHashTab));
-                        rc = RTSpinlockCreate(&g_Spinlock);
-                        if (RT_SUCCESS(rc))
+                        if (ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0) == DDI_SUCCESS)
                         {
-                            /*
-                             * Register ourselves as a character device, pseudo-driver
-                             */
-                            if (ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0) == DDI_SUCCESS)
-                            {
 #ifdef USE_SESSION_HASH
-                                pState->pDip = pDip;
-#endif
-                                ddi_report_dev(pDip);
-                                return DDI_SUCCESS;
-                            }
-
-                            /* Is this really necessary? */
-                            ddi_remove_minor_node(pDip, NULL);
-                            cmn_err(CE_NOTE,"VBoxDrvSolarisAttach: ddi_create_minor_node failed.");
-
-                            RTSpinlockDestroy(g_Spinlock);
-                            g_Spinlock = NIL_RTSPINLOCK;
+                            pState->pDip = pDip;
+#endif
+                            ddi_report_dev(pDip);
+                            return DDI_SUCCESS;
                         }
-                        else
-                            cmn_err(CE_NOTE, "VBoxDrvSolarisAttach: RTSpinlockCreate failed");
-                        supdrvDeleteDevExt(&g_DevExt);
+
+                        /* Is this really necessary? */
+                        ddi_remove_minor_node(pDip, NULL);
+                        cmn_err(CE_NOTE,"VBoxDrvSolarisAttach: ddi_create_minor_node failed.");
+
+                        RTSpinlockDestroy(g_Spinlock);
+                        g_Spinlock = NIL_RTSPINLOCK;
                     }
                     else
-                        cmn_err(CE_NOTE, "VBoxDrvSolarisAttach: supdrvInitDevExt failed");
-                    RTR0MpNotificationTerm(NULL);
+                        cmn_err(CE_NOTE, "VBoxDrvSolarisAttach: RTSpinlockCreate failed");
+                    supdrvDeleteDevExt(&g_DevExt);
                 }
-                else 
-                    cmn_err(CE_NOTE, "VBoxDrvSolarisAttach: RTR0MpNotifcationInit failed");
+                else
+                    cmn_err(CE_NOTE, "VBoxDrvSolarisAttach: supdrvInitDevExt failed");
                 RTR0Term();
             }
@@ -367 +360 @@
             g_Spinlock = NIL_RTSPINLOCK;
 
-            RTR0MpNotificationTerm(NULL);
             RTR0Term();