Changeset 12239 in vbox for trunk/src/VBox/Devices/PC/BIOS/rombios.c

Timestamp:

Sep 8, 2008 5:02:19 PM (16 years ago)

Author:

vboxsync

Message:

BIOS: Disabled the above 4GB memory change. This depends on PGM (and possibly MM) and therefore won't work yet. We'll get back to this later.

File:

• trunk/src/VBox/Devices/PC/BIOS/rombios.c (modified) (10 diffs)

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

@@ -4559 +4559 @@
     write_word(ES, DI, start);
     write_word(ES, DI+2, start >> 16);
-    write_word(ES, DI+4, 0x00);
+    write_word(ES, DI+4, 0x00); /** @todo r=bird: why write it twice? */
     write_word(ES, DI+4, extra_start);
     write_word(ES, DI+6, 0x00);
@@ -4571 +4571 @@
         write_word(ES, DI+12, 0x0001);
     else
-        // XXX: nike - is it really correct? see QEMU BIOS patch
+        /** @todo XXX: nike - is it really correct? see QEMU BIOS patch */
         write_word(ES, DI+12, extra_end);
 #else /* !VBOX */
@@ -4588 +4588 @@
 {
   Bit32u  extended_memory_size=0; // 64bits long
+#if 0  /* bird: later */
   Bit32u  extra_lowbits_memory_size=0;
+#endif
   Bit16u  CX,DX;
+#if 0  /* bird: later */
   Bit8u   extra_highbits_memory_size=0;
+#endif
 
 BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax);
@@ -4664 +4668 @@
                 }
 
+#if 0 /* 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;
@@ -4670 +4675 @@
                 extra_lowbits_memory_size *= 1024;
                 extra_highbits_memory_size = inb_cmos(0x63);
+#endif
 
                 switch(regs.u.r16.bx)
@@ -4716 +4722 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0x00100000L,
-                                       extended_memory_size - ACPI_DATA_SIZE ,0, 0, 1);
+                                       extended_memory_size - ACPI_DATA_SIZE, 0, 0, 1);
                         regs.u.r32.ebx = 4;
                         regs.u.r32.eax = 0x534D4150;
@@ -4737 +4743 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0xfffc0000L, 0x00000000L, 0, 0, 2);
+#if 0 /* bird: later */
                         if (extra_highbits_memory_size || extra_lowbits_memory_size)
                             regs.u.r32.ebx = 6;
                         else
+#endif
                             regs.u.r32.ebx = 0;
                         regs.u.r32.eax = 0x534D4150;
@@ -4745 +4753 @@
                         CLEAR_CF();
                         return;
+#if 0 /* bird: later */
                     case 6:
-                        /* Maping of memory above 4 GB */
-                        set_e820_range(ES, regs.u.r16.di, 
-                                       0x00000000L, extra_lowbits_memory_size, 
+                        /* Mapping of memory above 4 GB */
+                        set_e820_range(ES, regs.u.r16.di,
+                                       0x00000000L, extra_lowbits_memory_size,
                                        1, extra_highbits_memory_size + 1, 1);
                         regs.u.r32.ebx = 0;
@@ -4755 +4764 @@
                         CLEAR_CF();
                         return;
+#endif
                     default:  /* AX=E820, DX=534D4150, BX unrecognized */
                         goto int15_unimplemented;
@@ -8322 +8332 @@
   // signature. In general, it is impossible to tell a valid bootsector
   // from an invalid one.
-  // NB: It is somewhat common for failed OS installs to have the 
-  // 0x55AA signature and a valid partition table but zeros in the 
+  // NB: It is somewhat common for failed OS installs to have the
+  // 0x55AA signature and a valid partition table but zeros in the
   // rest of the boot sector. We do a quick check by comparing the first
   // two words of boot sector; if identical, the boot sector is