Index: /trunk/src/VBox/Devices/PC/BIOS/boot.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/boot.c	(revision 55136)
+++ /trunk/src/VBox/Devices/PC/BIOS/boot.c	(revision 55137)
@@ -255,9 +255,4 @@
 #endif // BX_ELTORITO_BOOT
 
-// Sanity check on the LAN boot seg macro
-//#if VBOX_LANBOOT_SEG == 0
-//#error Invalid VBOX_LANBOOT_SEG definition!
-//#endif
-
     // Check for boot from LAN first
     if (bootlan == 1) {
Index: /trunk/src/VBox/Devices/PC/BIOS/floppy.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/floppy.c	(revision 55136)
+++ /trunk/src/VBox/Devices/PC/BIOS/floppy.c	(revision 55137)
@@ -82,8 +82,6 @@
 uint8_t floppy_wait_for_interrupt(void)
 {
-    uint32_t    retries = 18;
-
     int_disable();
-    for (;retries;--retries)
+    for (;;)
     {
         uint8_t val8 = read_byte(0x0040, 0x003e);
@@ -92,5 +90,4 @@
         int_enable_hlt_disable();
     }
-    return 0;
 }
 
@@ -178,7 +175,6 @@
         // wait on 40:3e bit 7 to become 1
         do {
-            val8 = inb(0x80);
             val8 = read_byte(0x0040, 0x003e);
-        } while ( (val8 & 0x80) == 0 && --retries);
+        } while ( (val8 & 0x80) == 0 );
         val8 &= 0x7f;
         int_disable();
Index: /trunk/src/VBox/Devices/PC/BIOS/orgs.asm
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/orgs.asm	(revision 55136)
+++ /trunk/src/VBox/Devices/PC/BIOS/orgs.asm	(revision 55137)
@@ -1820,7 +1820,4 @@
 include smidmi.inc
 
-		BIOSORG	0FFE8h
-		dw	3330h
-
 ;; --------------------------------------------------------
 ;; Processor reset entry point
Index: /trunk/src/VBox/Devices/PC/BIOS/post.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/post.c	(revision 55136)
+++ /trunk/src/VBox/Devices/PC/BIOS/post.c	(revision 55137)
@@ -100,4 +100,3 @@
         }
     }
-    outb_cmos(0x12, 0x20);
 }
Index: /trunk/src/VBox/Devices/PC/BIOS/scsi.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/scsi.c	(revision 55136)
+++ /trunk/src/VBox/Devices/PC/BIOS/scsi.c	(revision 55137)
@@ -429,5 +429,4 @@
                           | ((uint32_t)buffer[2] << 8)
                           | ((uint32_t)buffer[3]);
-                ++sectors;  /* Returned value is the last LBA, zero-based. */
 
                 sector_size =   ((uint32_t)buffer[4] << 24)