Changeset 36028 in vbox for trunk/src/VBox

Timestamp:

Feb 21, 2011 9:54:29 AM (14 years ago)

Author:

vboxsync

Message:

PCI: more host API, lifetime issues

Location:

trunk/src/VBox/HostDrivers/VBoxPci

Files:

• VBoxPci.c (modified) (6 diffs)
• VBoxPciInternal.h (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -101 +101 @@
 }
 
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnDeinit
+ */
+DECLHIDDEN(int) vboxPciDevDeinit(PRAWPCIDEVPORT pPort, uint32_t fFlags)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevDeinit(pThis, fFlags);
+
+    return rc;
+}
+
+
+DECLHIDDEN(int) vboxPciDevGetRegionInfo(PRAWPCIDEVPORT pPort,
+                                        int32_t        iRegion,
+                                        RTHCPHYS       *pRegionStart,
+                                        uint64_t       *pu64RegionSize,
+                                        bool           *pfPresent,
+                                        bool           *pfMmio)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevGetRegionInfo(pThis, iRegion,
+                                       pRegionStart, pu64RegionSize,
+                                       pfPresent, pfMmio);
+
+    return rc;
+}
+
+DECLHIDDEN(int) vboxPciDevMapRegion(PRAWPCIDEVPORT pPort,
+                                    int32_t        iRegion,
+                                    RTHCPHYS       pRegionStart,
+                                    uint64_t       u64RegionSize,
+                                    RTR0PTR        *pRegionBase)
+{
+#if 0
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevMapRegion(pThis, iRegion, pRegionStart, pu64RegionSize, pRegionBase);
+
+    return rc;
+#else
+    return VINF_SUCCESS;
+#endif
+}
+
+
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnPciCfgRead
+ */
+DECLHIDDEN(int) vboxPciDevPciCfgRead(PRAWPCIDEVPORT pPort, uint32_t Register, PCIRAWMEMLOC      *pValue)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevPciCfgRead(pThis, Register, pValue);
+
+    return rc;
+}
+
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnPciCfgWrite
+ */
+DECLHIDDEN(int) vboxPciDevPciCfgWrite(PRAWPCIDEVPORT pPort, uint32_t Register, PCIRAWMEMLOC *pValue)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevPciCfgWrite(pThis, Register, pValue);
+
+    return rc;
+}
 
 /**
@@ -110 +180 @@
  * @param   ppDevPort           Where to store the pointer to our port interface.
  */
-static int vboxPciNewInstance(PVBOXRAWPCIGLOBALS pGlobals, 
-                              uint32_t           u32HostAddress, 
+static int vboxPciNewInstance(PVBOXRAWPCIGLOBALS pGlobals,
+                              uint32_t           u32HostAddress,
                               uint32_t           fFlags,
                               PRAWPCIDEVPORT     *ppDevPort)
@@ -122 +192 @@
     pNew->pGlobals                      = pGlobals;
     pNew->hSpinlock                     = NIL_RTSPINLOCK;
-    pNew->cRefs                         = 1;    
+    pNew->cRefs                         = 1;
     pNew->pNext                         = NULL;
     pNew->HostPciAddress                = u32HostAddress;
 
     pNew->DevPort.u32Version            = RAWPCIDEVPORT_VERSION;
+
     pNew->DevPort.pfnRetain             = vboxPciDevRetain;
     pNew->DevPort.pfnRelease            = vboxPciDevRelease;
     pNew->DevPort.pfnInit               = vboxPciDevInit;
+    pNew->DevPort.pfnDeinit             = vboxPciDevDeinit;
+    pNew->DevPort.pfnGetRegionInfo      = vboxPciDevGetRegionInfo;
+    pNew->DevPort.pfnMapRegion          = vboxPciDevMapRegion;
+    pNew->DevPort.pfnPciCfgRead         = vboxPciDevPciCfgRead;
+    pNew->DevPort.pfnPciCfgWrite        = vboxPciDevPciCfgWrite;
+
     pNew->DevPort.u32VersionEnd         = RAWPCIDEVPORT_VERSION;
-    
+
     rc = RTSpinlockCreate(&pNew->hSpinlock);
 
@@ -155 +232 @@
  * @copydoc RAWPCIFACTORY::pfnCreateAndConnect
  */
-static DECLCALLBACK(int) vboxPciFactoryCreateAndConnect(PRAWPCIFACTORY       pFactory, 
-                                                        uint32_t             u32HostAddress, 
+static DECLCALLBACK(int) vboxPciFactoryCreateAndConnect(PRAWPCIFACTORY       pFactory,
+                                                        uint32_t             u32HostAddress,
                                                         uint32_t             fFlags,
                                                         PRAWPCIDEVPORT       *ppDevPort)
@@ -320 +397 @@
     int rc = vboxPciInitGlobals(pGlobals);
     if (RT_SUCCESS(rc))
-    {     
+    {
         rc = vboxPciInitIdc(pGlobals);
         if (RT_SUCCESS(rc))
@@ -335 +412 @@
 {
     int rc = vboxPciDeleteIdc(pGlobals);
-    
+
     if (RT_SUCCESS(rc))
         vboxPciDeleteGlobals(pGlobals);

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h

@@ -54 +54 @@
     uint32_t           HostPciAddress;
 
+#ifdef RT_OS_LINUX
+    struct pci_dev  *  pPciDev;
+#endif
+
     /** The session this interface is associated with. */
     PSUPDRVSESSION     pSession;
     /** The SUPR0 object id. */
     void               *pvObj;
-    
+
     /** Port, given to the outside world. */
     RAWPCIDEVPORT      DevPort;
@@ -95 +99 @@
 DECLHIDDEN(int)  vboxPciOsDevInit  (PVBOXRAWPCIINS pIns, uint32_t fFlags);
 DECLHIDDEN(int)  vboxPciOsDevDeinit(PVBOXRAWPCIINS pIns, uint32_t fFlags);
+DECLHIDDEN(int)  vboxPciOsDevGetRegionInfo(PVBOXRAWPCIINS pIns,
+                                           int32_t        iRegion,
+                                           RTHCPHYS       *pRegionStart,
+                                           uint64_t       *pu64RegionSize,
+                                           bool           *pfPresent,
+                                           bool           *pfMmio);
+DECLHIDDEN(int)  vboxPciOsDevPciCfgWrite(PVBOXRAWPCIINS pIns, uint32_t Register, PCIRAWMEMLOC *pValue);
+DECLHIDDEN(int)  vboxPciOsDevPciCfgRead (PVBOXRAWPCIINS pIns, uint32_t Register, PCIRAWMEMLOC *pValue);
 
 RT_C_DECLS_END