Changeset 59115 in vbox

Timestamp:

Dec 14, 2015 1:50:06 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104686

Message:

Undoing unintentional commits.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• floppy.c (modified) (3 diffs)
• makefile (modified) (2 diffs)

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

@@ -82 +82 @@
 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 +90 @@
         int_enable_hlt_disable();
     }
-    return 0;
 }
 
@@ -178 +175 @@
         // 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();

trunk/src/VBox/Devices/PC/BIOS/makefile

@@ -16 +16 @@
 CFLAGS   = -q -0 -wx -zu -s -oas -d1+ -ms
 CFLAGS32 = -q -wx -zu -s -oas -d1+ -ms -nt=BIOS32 -nd=BIOS32
-# -oat seems to prevent ENTER/LEAVE generation
-#CFLAGS32 = -q -wx -zu -s -oat -d1+ -ms -nt=BIOS32 -nd=BIOS32
 
 DEFS = -DVBOX -DVBOX_LANBOOT_SEG=0xE200 -DVBOX_VERSION_STRING=$(Q)0.9$(Q) &
@@ -47 +45 @@
          clname DATA segaddr=0xF000 segment _DATA &
          clname CODE &
-         segment _TEXT segaddr=0xF000 offset=0x1C00 &
+         segment _TEXT segaddr=0xF000 offset=0x1600 &
          segment BIOS32 segaddr=0xF000 offset=0xDB00 &
          segment BIOSSEG segaddr=0xF000 offset=0xE000 &