Changeset 69025 in vbox

Timestamp:

Oct 10, 2017 3:10:39 PM (7 years ago)

Author:

vboxsync

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

118299

Message:

BIOS: Set INT 41h/46h in ATA setup rather than in assembler startup code.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• ata.c (modified) (1 diff)
• orgs.asm (modified) (1 diff)

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

@@ -529 +529 @@
             if (device < 2)
             {
-                uint8_t         sum, i;
-                fdpt_t __far    *fdpt;
-
-                if (device == 0)
+                uint8_t             sum, i;
+                fdpt_t __far        *fdpt;
+                void __far * __far  *int_vec;
+
+                if (device == 0) {
                     fdpt = ebda_seg :> &EbdaData->fdpt0;
-                else
+                    int_vec = MK_FP(0, 0x41 * sizeof(void __far *));
+                }
+                else {
                     fdpt = ebda_seg :> &EbdaData->fdpt1;
+                    int_vec = MK_FP(0, 0x46 * sizeof(void __far *));
+                }
+                /* Set the INT 41h or 46h pointer. */
+                *int_vec = fdpt;
 
                 /* Update the DPT for drive 0/1 pointed to by Int41/46. This used

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -582 +582 @@
                 SET_INT_VECTOR 13h, BIOSSEG, int13_handler
                 SET_INT_VECTOR 76h, BIOSSEG, int76_handler
-                ;; INT 41h/46h: hard disk 0/1 dpt
-                ; TODO: This should be done from the code which
-                ; builds the DPTs?
-                SET_INT_VECTOR 41h, EBDA_SEG, 3Dh
-                SET_INT_VECTOR 46h, EBDA_SEG, 4Dh
+                ;; The ATA init code sets up INT 41h/46h FDPT pointers
                 ret