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

Timestamp:

Oct 11, 2017 8:33:43 AM (8 years ago)

Author:

vboxsync

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

118310

Message:

BIOS: Put logical SPT into the FDPT properly; simplified conditional.

File:

• trunk/src/VBox/Devices/PC/BIOS/ata.c (modified) (2 diffs)

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

@@ -533 +533 @@
                 void __far * __far  *int_vec;
 
-                if (device == 0) {
+                if (device == 0)
                     fdpt = ebda_seg :> &EbdaData->fdpt0;
-                    int_vec = MK_FP(0, 0x41 * sizeof(void __far *));
-                }
-                else {
+                else
                     fdpt = ebda_seg :> &EbdaData->fdpt1;
-                    int_vec = MK_FP(0, 0x46 * sizeof(void __far *));
-                }
+
                 /* Set the INT 41h or 46h pointer. */
+                int_vec  = MK_FP(0, (0x41 + device * 5) * sizeof(void __far *));
                 *int_vec = fdpt;
 
@@ -554 +552 @@
                 fdpt->cyl   = cylinders;
                 fdpt->head  = heads;
-                fdpt->lspt  = spt;
+                fdpt->lspt  = lgeo.spt;
                 sum = 0;
                 for (i = 0; i < 0xf; i++)