Changeset 18663 in vbox for trunk/src/VBox

Timestamp:

Apr 2, 2009 7:08:14 PM (16 years ago)

Author:

vboxsync

Message:

Devices: Clean out the VBOX_WITH_NEW_PHYS_CODE #ifdefs.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevPcArch.c (modified) (1 diff)
• DevPcBios.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevPcArch.c

@@ -251 +251 @@
     if (RT_FAILURE(rc))
         return rc;
-
-#ifndef VBOX_WITH_NEW_PHYS_CODE
-    /*
-     * Reserve ROM/MMIO areas:
-     * 1. 0x000a0000-0x000fffff
-     * 2. 0xfff80000-0xffffffff
-     * Note: This will be removed before long.
-     */
-    rc = MMR3PhysReserve(PDMDevHlpGetVM(pDevIns), 0x000a0000, 0x50000, "Low ROM Region");
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = MMR3PhysReserve(PDMDevHlpGetVM(pDevIns), 0xfff80000, 0x80000, "High ROM Region");
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -1224 +1224 @@
         pcbiosPlantMPStable(pDevIns, pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE, pThis->cCpus);
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE
     /*
      * Re-shadow the LAN ROM image and make it RAM/RAM.
@@ -1258 +1257 @@
         cPages--;
     }
-#endif
 }
 
@@ -1767 +1765 @@
         rc = PDMDevHlpROMRegister(pDevIns, VBOX_LANBOOT_SEG << 4, cbLanBootBinary, pu8LanBootBinary,
                                   PGMPHYS_ROM_FLAGS_SHADOWED, "Net Boot ROM");
-#ifdef VBOX_WITH_NEW_PHYS_CODE
         if (RT_SUCCESS(rc))
         {
@@ -1775 +1772 @@
             AssertRCReturn(rc, rc);
         }
-#endif
     }