Changeset 5263 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 12, 2007 3:43:33 PM (17 years ago)

Author:

vboxsync

Message:

drop the whole bootchk bit if it's not supposed to be used.

File:

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

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

@@ -4002 +4002 @@
 #ifdef VBOX
   case 0x89:
-    // Switch to Protected Mode. 
+    // Switch to Protected Mode.
     // ES:DI points to user-supplied GDT
     // BH/BL contains starting interrupt numbers for PIC0/PIC1
@@ -7977 +7977 @@
   Bit8u  bootlan;
 #endif /* VBOX */
+#ifndef VBOX
   Bit8u  bootchk;
+#endif /* !VBOX */
   Bit16u bootseg;
   Bit16u status;
@@ -8174 +8176 @@
     }
 
-  // check signature if instructed by cmos reg 0x38, only for floppy
-  // bootchk = 1 : signature check disabled
-  // bootchk = 0 : signature check enabled
-  if (bootdrv != 0) bootchk = 0;
 #ifdef VBOX
-  // Don't check boot sectors on floppies and don't read CMOS - byte 
+  // Don't check boot sectors on floppies and don't read CMOS - byte
   // 0x38 in CMOS always has the low bit clear.
   // There is *no* requirement whatsoever for a valid boot sector to
@@ -8187 +8185 @@
   // in one of the first few bytes, absence of long sequences of identical
   // bytes at the start or beginning or boot sector etc.
-  // The risk of attempting to boot an invalid floppy is low, certainly 
+  // The risk of attempting to boot an invalid floppy is low, certainly
   // lower than the risk of refusing to boot a valid floppy.
-  bootchk = 1;
-#else
+#else /* !VBOX */
+  // check signature if instructed by cmos reg 0x38, only for floppy
+  // bootchk = 1 : signature check disabled
+  // bootchk = 0 : signature check enabled
+  if (bootdrv != 0) bootchk = 0;
   else bootchk = inb_cmos(0x38) & 0x01;
-#endif
 
 #if BX_ELTORITO_BOOT
@@ -8210 +8210 @@
       }
     }
+#endif /* !VBOX */
 
 #if BX_ELTORITO_BOOT