Changeset 32329 in vbox

Timestamp:

Sep 8, 2010 7:14:21 PM (14 years ago)

Author:

vboxsync

Message:

AHCI/ATAPI: Make it work with Windows guests

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -1336 +1336 @@
              * Set states in the Port Signature and SStatus registers.
              */
-            pAhciPort->regSIG  = 0x101; /* Signature for SATA device. */
+            if (pAhciPort->fATAPI)
+                pAhciPort->regSIG = AHCI_PORT_SIG_ATAPI;
+            else
+                pAhciPort->regSIG = AHCI_PORT_SIG_DISK;
             pAhciPort->regSSTS = (0x01 << 8) | /* Interface is active. */
                                  (0x02 << 4) | /* Generation 2 (3.0GBps) speed. */
@@ -1921 +1924 @@
              * Set states in the Port Signature and SStatus registers.
              */
-            pAhciPort->regSIG  = 0x101; /* Signature for SATA device. */
+            if (pAhciPort->fATAPI)
+                pAhciPort->regSIG = AHCI_PORT_SIG_ATAPI;
+            else
+                pAhciPort->regSIG = AHCI_PORT_SIG_DISK;
             pAhciPort->regSSTS = (0x01 << 8) | /* Interface is active. */
                                  (0x02 << 4) | /* Generation 2 (3.0GBps) speed. */
@@ -2606 +2612 @@
     d2hFis[AHCI_CMDFIS_SECTC] = 0x01;
 
-    pAhciPort->regTFD = (1 << 8) | ATA_STAT_SEEK | ATA_STAT_WRERR;
+    pAhciPort->regTFD = (1 << 8) | ATA_STAT_READY | ATA_STAT_SEEK | ATA_STAT_WRERR;
 
     ahciPostFisIntoMemory(pAhciPort, AHCI_CMDFIS_TYPE_D2H, d2hFis);
@@ -4478 +4484 @@
 
     /* As this is the first D2H FIS after the reset update the signature in the SIG register of the port. */
-    pAhciPort->regSIG  = 0x101;
+    if (pAhciPort->fATAPI)
+        pAhciPort->regSIG = AHCI_PORT_SIG_ATAPI;
+    else
+        pAhciPort->regSIG = AHCI_PORT_SIG_DISK;
     ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciPortTaskState->uTag));