Changeset 12743 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Sep 25, 2008 2:52:50 PM (16 years ago)

Author:

vboxsync

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

37066

Message:

Enabled 2nd pci memory region in the VMM device again. (type prefetchable this time to work around an old additions bug)

File:

• trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1606 +1606 @@
     int rc;
 
-#ifdef VBOX_WITH_VMMDEV_HEAP
     AssertReturn(iRegion <= 2 && enmType == PCI_ADDRESS_SPACE_MEM || enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
-#else
-    AssertReturn(iRegion <= 1 && enmType == PCI_ADDRESS_SPACE_MEM, VERR_INTERNAL_ERROR);
-#endif
     Assert(pThis->pVMMDevRAMR3 != NULL);
     Assert(pThis->pVMMDevHeapR3 != NULL);
@@ -1634 +1630 @@
         }
     }
-#ifdef VBOX_WITH_VMMDEV_HEAP
     else
     if (iRegion == 2)
@@ -1659 +1654 @@
         }
     }
-#endif
 
     return rc;
@@ -2298 +2292 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_VMMDEV_HEAP
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 2, VMMDEV_HEAP_SIZE, PCI_ADDRESS_SPACE_MEM_PREFETCH, vmmdevIORAMRegionMap);
     if (RT_FAILURE(rc))
         return rc;
-#endif
 
     /*