Changeset 106058 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2024 10:30:47 AM (3 months ago)

Author:

vboxsync

Message:

BIOS: Re-fixed AHCI debugging code.

File:

• trunk/src/VBox/Devices/PC/BIOS/ahci.c (modified) (3 diffs)

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

@@ -354 +354 @@
     int             i;
 
+    DBG_AHCI("AHCI: Data block at %04X:%04X\n", FP_SEG(ahci), FP_OFF(ahci));
     _fmemset(&ahci->abCmd[0], 0, sizeof(ahci->abCmd));
 
@@ -495 +496 @@
 
     DBG_AHCI("AHCI: FIS receive area %lx from %x:%x\n",
-             ahci_addr_to_phys(&ahci->abFisRecv), FP_SEG(ahci->abFisRecv), FP_OFF(ahci->abFisRecv));
+             ahci_addr_to_phys(&ahci->abFisRecv), FP_SEG(&ahci->abFisRecv), FP_OFF(&ahci->abFisRecv));
     VBOXAHCI_PORT_WRITE_REG(ahci->iobase, u8Port, AHCI_REG_PORT_FB, ahci_addr_to_phys(&ahci->abFisRecv));
     VBOXAHCI_PORT_WRITE_REG(ahci->iobase, u8Port, AHCI_REG_PORT_FBU, 0);
@@ -856 +857 @@
              ahci_ctrl_extract_bits(val, 0x0000ffff,  0));
 
-    DBG_AHCI("AHCI: ahci_seg=%04x, size=%04x, pointer at EBDA:%04x (EBDA size=%04x)\n",
-             ahci_seg, sizeof(ahci_t), (uint16_t)&EbdaData->bdisk.ahci_seg, sizeof(ebda_data_t));
-
     bios_dsk->ahci_seg    = ahci_seg;
     bios_dsk->ahci_devcnt = 0;
+
+    DBG_AHCI("AHCI: ahci_seg=%04x, size=%04x, pointer at EBDA:%04x (EBDA size=%04x)\n",
+             bios_dsk->ahci_seg, sizeof(ahci_t), (uint16_t)&EbdaData->bdisk.ahci_seg, sizeof(ebda_data_t));
 
     ahci = ahci_seg :> 0;