Changeset 6774 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 4, 2008 6:48:03 AM (17 years ago)

Author:

vboxsync

Message:

Solaris vboxguest: Fix ifdef and updated conf file.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -834 +834 @@
 static int VBoxGuestSolarisAddIRQ(dev_info_t *pDip, void *pvState)
 {
+    LogFlow((DEVICE_NAME ":VBoxGuestSolarisAddIRQ %p\n", pvState));
+
+    VBoxAddDevState *pState = (VBoxAddDevState *)pvState;
 #if 0
     /*
@@ -840 +843 @@
      * and non-obsolete way of setting up IRQs.
      */
-    rc = ddi_get_iblock_cookie(pDip, 0, &pState->BlockCookie);
+    int rc = ddi_get_iblock_cookie(pDip, 0, &pState->BlockCookie);
     if (rc == DDI_SUCCESS)
     {
@@ -851 +854 @@
         Log((DEVICE_NAME ":ddi_get_iblock_cookie failed. Cannot set IRQ for VMMDev.\n"));
     return rc;
-#endif
-    int rc;
+#else
     int IntrType;
-    VBoxAddDevState *pState = (VBoxAddDevState *)pvState;
-    LogFlow((DEVICE_NAME ":VBoxGuestSolarisAddIRQ %p\n", pvState));
-
-    rc = ddi_intr_get_supported_types(pDip, &IntrType);
+    int rc = ddi_intr_get_supported_types(pDip, &IntrType);
     if (rc == DDI_SUCCESS)
     {
@@ -937 +936 @@
         LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: failed to get supported interrupt types\n"));
     return rc;
+#endif
 }
 
@@ -954 +954 @@
     ddi_remove_intr(pDip, 0, pState->BlockCookie);
     mutex_destroy(&pState->Mtx);
-#endif
+#else
     for (int i = 0; i < pState->cIntr; i++)
     {
@@ -967 +967 @@
     RTMemFree(pState->pIntr);
     mutex_destroy(&pState->Mtx);
+#endif
 }