Changeset 77349 in vbox for trunk/src

Timestamp:

Feb 18, 2019 3:47:23 PM (6 years ago)

Author:

vboxsync

Message:

DevATA: EXECUTE DEVICE DIAGNOSTIC must always be run on both device 0 and 1. Fixes detection of CD-ROM as primary slave in EFI.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (3 diffs)

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

@@ -3920 +3920 @@
 
 
-static bool ataR3ExecuteDeviceDiagnosticSS(ATADevState *s)
+static void ataR3DeviceDiag(ATADevState *s)
 {
     ataR3SetSignature(s);
@@ -3928 +3928 @@
         ataSetStatusValue(s, ATA_STAT_READY | ATA_STAT_SEEK);
     s->uATARegError = 0x01;
+}
+
+
+static bool ataR3ExecuteDeviceDiagnosticSS(ATADevState *s)
+{
+    PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
+
+    /* EXECUTE DEVICE DIAGNOSTIC is a very special command which always
+     * gets executed, regardless of which device is selected. As a side
+     * effect, it always completes with device 0 selected.
+     */
+    for (uint32_t i = 0; i < RT_ELEMENTS(pCtl->aIfs); i++)
+        ataR3DeviceDiag(&pCtl->aIfs[i]);
+
+    LogRel(("ATA: LUN#%d: EXECUTE DEVICE DIAGNOSTIC, status %02X\n",
+            s->iLUN, s->uATARegStatus));
+    pCtl->iSelectedIf = 0;
+
     return false;
 }
@@ -5876 +5894 @@
                 {
                     ataR3ResetDevice(s);
-                    ataR3ExecuteDeviceDiagnosticSS(s);
+                    ataR3DeviceDiag(s);
                 }
                 else