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

Timestamp:

Mar 21, 2018 11:26:28 AM (7 years ago)

Author:

vboxsync

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

121391

Message:

Reverted bad commit.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ata.c (modified) (2 diffs)
• makefile (modified) (2 diffs)

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

@@ -552 +552 @@
                     fdpt = ebda_seg :> &EbdaData->fdpt1;
 
-                fdpt = MK_FP(0xE200, 0xf00);
-                fdpt += device;
-
                 /* Set the INT 41h or 46h pointer. */
                 int_vec  = MK_FP(0, (0x41 + device * 5) * sizeof(void __far *));
@@ -563 +560 @@
                  * isn't worth the effort of converting from AMI to Award CMOS
                  * format. Just do it here. */
-                _fmemset(fdpt, 0, sizeof(*fdpt));
                 fdpt->lcyl  = lgeo.cylinders;
                 fdpt->lhead = lgeo.heads;

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

@@ -19 +19 @@
 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) &
@@ -55 +53 @@
          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 &