Changeset 12700 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 24, 2008 4:05:00 PM (17 years ago)

Author:

vboxsync

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

37007

Message:

Conditional 2nd mmio region for VMMDev.

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