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

Timestamp:

Sep 15, 2008 3:42:08 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_MORE_THAN_4GB config variable

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/rombios.c (modified) (4 diffs)
• DevPcBios.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -4588 +4588 @@
 {
   Bit32u  extended_memory_size=0; // 64bits long
-#if VBOX_WITH_SMP_GUESTS
+#ifdef VBOX_WITH_MORE_THAN_4GB
   Bit32u  extra_lowbits_memory_size=0;
 #endif
   Bit16u  CX,DX;
-#if VBOX_WITH_SMP_GUESTS
+#ifdef VBOX_WITH_MORE_THAN_4GB
   Bit8u   extra_highbits_memory_size=0;
 #endif
@@ -4668 +4668 @@
                 }
 
-#if VBOX_WITH_SMP_GUESTS /* bird: later (btw. this ain't making sense complixity wise, unless its a AMI/AWARD/PHOENIX interface) */
+#ifdef VBOX_WITH_MORE_THAN_4GB /* bird: later (btw. this ain't making sense complixity wise, unless its a AMI/AWARD/PHOENIX interface) */
                 extra_lowbits_memory_size = inb_cmos(0x61);
                 extra_lowbits_memory_size <<= 8;
@@ -4743 +4743 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0xfffc0000L, 0x00000000L, 0, 0, 2);
-#if VBOX_WITH_SMP_GUESTS
+#ifdef VBOX_WITH_MORE_THAN_4GB
                         if (extra_highbits_memory_size || extra_lowbits_memory_size)
                             regs.u.r32.ebx = 6;
@@ -4753 +4753 @@
                         CLEAR_CF();
                         return;
-#if VBOX_WITH_SMP_GUESTS
+#ifdef VBOX_WITH_MORE_THAN_4GB
                     case 6:
                         /* Mapping of memory above 4 GB */

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

@@ -517 +517 @@
      * Memory sizes.
      */
-#if VBOX_WITH_SMP_GUESTS
+#ifdef VBOX_WITH_MORE_THAN_4GB
     uint64_t cKBRam = pThis->cbRam / _1K;
     uint64_t cKBAbove4GB = 0;