Changeset 36055 in vbox for trunk/src/VBox

Timestamp:

Feb 22, 2011 4:15:17 PM (14 years ago)

Author:

vboxsync

Message:

PCI: regions work

Location:

trunk/src/VBox/HostDrivers/VBoxPci

Files:

• VBoxPci.c (modified) (3 diffs)
• VBoxPciInternal.h (modified) (1 diff)

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

@@ -114 +114 @@
 
 
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnGetRegionInfo
+ */
 DECLHIDDEN(int) vboxPciDevGetRegionInfo(PRAWPCIDEVPORT pPort,
                                         int32_t        iRegion,
@@ -130 +133 @@
 }
 
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnMapRegion
+ */
 DECLHIDDEN(int) vboxPciDevMapRegion(PRAWPCIDEVPORT pPort,
                                     int32_t        iRegion,
-                                    RTHCPHYS       pRegionStart,
+                                    RTHCPHYS       RegionStart,
                                     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
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevMapRegion(pThis, iRegion, RegionStart, u64RegionSize, pRegionBase);
+
+    return rc;
+}
+
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnUnapRegion
+ */
+DECLHIDDEN(int) vboxPciDevUnmapRegion(PRAWPCIDEVPORT pPort,
+                                      RTHCPHYS       RegionStart,
+                                      uint64_t       u64RegionSize,
+                                      RTR0PTR        RegionBase)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevUnmapRegion(pThis, RegionStart, u64RegionSize, RegionBase);
+
+    return rc;
 }
 
@@ -204 +221 @@
     pNew->DevPort.pfnGetRegionInfo      = vboxPciDevGetRegionInfo;
     pNew->DevPort.pfnMapRegion          = vboxPciDevMapRegion;
+    pNew->DevPort.pfnUnmapRegion        = vboxPciDevUnmapRegion;
     pNew->DevPort.pfnPciCfgRead         = vboxPciDevPciCfgRead;
     pNew->DevPort.pfnPciCfgWrite        = vboxPciDevPciCfgWrite;

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

@@ -105 +105 @@
                                            bool           *pfPresent,
                                            bool           *pfMmio);
+DECLHIDDEN(int)  vboxPciOsDevMapRegion(PVBOXRAWPCIINS pIns,
+                                       int32_t        iRegion,
+                                       RTHCPHYS       pRegionStart,
+                                       uint64_t       u64RegionSize,
+                                       RTR0PTR        *pRegionBase);
+DECLHIDDEN(int)  vboxPciOsDevUnmapRegion(PVBOXRAWPCIINS pIns,
+                                         RTHCPHYS       RegionStart,
+                                         uint64_t       u64RegionSize,
+                                         RTR0PTR        RegionBase);
 DECLHIDDEN(int)  vboxPciOsDevPciCfgWrite(PVBOXRAWPCIINS pIns, uint32_t Register, PCIRAWMEMLOC *pValue);
 DECLHIDDEN(int)  vboxPciOsDevPciCfgRead (PVBOXRAWPCIINS pIns, uint32_t Register, PCIRAWMEMLOC *pValue);