Changeset 6050 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 11, 2007 2:18:07 PM (17 years ago)

Author:

vboxsync

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

26687

Message:

getinfo EP and conf file.

File:

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

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

@@ -63 +63 @@
 static int VBoxAddSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int mode, cred_t *pCred, int *pVal);
 
+static int VBoxAddSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppResult);
 static int VBoxAddSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd);
 static int VBoxAddSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd);
@@ -108 +109 @@
     DEVO_REV,               /* driver build revision */
     0,                      /* ref count */
-    nulldev,                /* get info */
+    VBoxAddSolarisGetInfo,
     nulldev,                /* identify */
     nulldev,                /* probe */
@@ -146 +147 @@
     /** PCI handle of VMMDev. */
     ddi_acc_handle_t        PciHandle;
+    /** IO port handle. */
+    ddi_acc_handle_t        PciIOHandle;
+    /** MMIO handle. */
+    ddi_acc_handle_t        PciMMIOHandle;
     /** Interrupt block cookie. */
     ddi_iblock_cookie_t     BlockCookie;
@@ -303 +308 @@
                                 deviceAttr.devacc_attr_dataorder = DDI_STRICTORDER_ACC;
                                 deviceAttr.devacc_attr_access = DDI_DEFAULT_ACC;
-                                rc = ddi_regs_map_setup(pDip, 0, &baseAddr, 0, cbIOSize, &deviceAttr, &pState->PciHandle);
+                                rc = ddi_regs_map_setup(pDip, 0, &baseAddr, 0, cbIOSize, &deviceAttr, &pState->PciIOHandle);
                                 if (rc == DDI_SUCCESS)
                                 {
                                     pState->uIOPortBase = (uint16_t)*baseAddr;
-                                    rc = ddi_regs_map_setup(pDip, 1, &baseAddr, 0, pState->cbMMIO, &deviceAttr, &pState->PciHandle);
+                                    rc = ddi_regs_map_setup(pDip, 1, &baseAddr, 0, pState->cbMMIO, &deviceAttr, &pState->PciMMIOHandle);
                                     if (rc == DDI_SUCCESS)
                                     {
@@ -341 +346 @@
                                         else
                                             VBA_LOGNOTE("VBoxGuestSolarisAddIRQ failed.\n");
+                                        ddi_regs_map_free(&pState->PciMMIOHandle);
                                     }
                                     else
                                         VBA_LOGNOTE("ddi_regs_map_setup for MMIO region failed.\n");
-                                    ddi_regs_map_free(&pState->PciHandle);
+                                    ddi_regs_map_free(&pState->PciIOHandle);
                                 }
                                 else
@@ -360 +366 @@
                 }
                 else
-                    VBA_LOGNOTE("pci_config_setup failed.\n");
+                    VBA_LOGNOTE("pci_config_setup failed rc=%d.\n", rc);
                 RTSpinlockDestroy(g_Spinlock);
                 g_Spinlock = NIL_RTSPINLOCK;
@@ -424 +430 @@
             return DDI_FAILURE;
     }
+}
+
+
+/**
+ * Info entry point, called by solaris kernel for obtaining driver info.
+ *
+ * @param   pDip            The module structure instance (do not use).
+ * @param   enmCmd          Information request type.
+ * @param   pArg            Type specific argument.
+ * @param   ppResult        Where to store the requested info.
+ *
+ * @return  corresponding solaris error code.
+ */
+static int VBoxAddSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppResult)
+{
+    VBA_LOGCONT("VBoxAddSolarisGetInfo\n");
+
+    int rc = DDI_SUCCESS;
+    switch (enmCmd)
+    {
+        case DDI_INFO_DEVT2DEVINFO:
+            *ppResult = (void *)g_pDip;
+            break;
+
+        case DDI_INFO_DEVT2INSTANCE:
+            *ppResult = (void *)ddi_get_instance(g_pDip);
+            break;
+
+        default:
+            rc = DDI_FAILURE;
+            break;
+    }
+    return rc;
 }