Changeset 83127 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Feb 21, 2020 10:46:07 AM (5 years ago)

Author:

vboxsync

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

136240

Message:

DevBusLogic: Generalized commands that do not set CMDC.

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (7 diffs)

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

@@ -1190 +1190 @@
  * @param   pThis           Pointer to the shared BusLogic instance data.
  * @param   fSuppressIrq    Flag to suppress IRQ generation regardless of current state
- */
-static void buslogicCommandComplete(PPDMDEVINS pDevIns, PBUSLOGIC pThis, bool fSuppressIrq)
+ * @param   fNoComplStat    Flag to suppress command completion status as well
+ */
+static void buslogicCommandComplete(PPDMDEVINS pDevIns, PBUSLOGIC pThis, bool fSuppressIrq, bool fSuppressCMDC)
 {
     LogFlowFunc(("pThis=%#p\n", pThis));
@@ -1200 +1201 @@
     pThis->iReply = 0;
 
-    /* The Enable OMBR command does not set CMDC when successful. */
-    if (pThis->uOperationCode != BUSLOGICCOMMAND_ENABLE_OUTGOING_MAILBOX_AVAILABLE_INTERRUPT)
+    /* Some commands do not set CMDC when successful. */
+    if (!fSuppressCMDC)
     {
         /* Notify that the command is complete. */
@@ -1812 +1813 @@
     int rc = VINF_SUCCESS;
     bool fSuppressIrq = false;
+    bool fSuppressCMDC = false;
 
     LogFlowFunc(("pThis=%#p\n", pThis));
@@ -1854 +1856 @@
             pThis->cbReplyParametersLeft = 0;
             fSuppressIrq = true;
+            fSuppressCMDC = true;
             break;
 #else
@@ -2260 +2263 @@
                 pThis->LocalRam.structured.autoSCSIData.uReserved6 = uEnable;
                 fSuppressIrq = true;
+                fSuppressCMDC = true;
             }
             break;
@@ -2344 +2348 @@
         pThis->regStatus |= BL_STAT_DIRRDY;
     else if (!pThis->cbCommandParametersLeft)
-        buslogicCommandComplete(pDevIns, pThis, fSuppressIrq);
+        buslogicCommandComplete(pDevIns, pThis, fSuppressIrq, fSuppressCMDC );
 
     return rc;
@@ -2414 +2418 @@
                      */
                     if (pThis->uOperationCode == BUSLOGICCOMMAND_FETCH_HOST_ADAPTER_LOCAL_RAM)
-                        buslogicCommandComplete(pDevIns, pThis, true /* fSuppressIrq */);
+                        buslogicCommandComplete(pDevIns, pThis, true /* fSuppressIrq */, true /* fSuppressCMDC */ );
                     else
-                        buslogicCommandComplete(pDevIns, pThis, false);
+                        buslogicCommandComplete(pDevIns, pThis, false, false);
                 }
             }