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

Timestamp:

Feb 21, 2020 12:31:05 PM (5 years ago)

Author:

vboxsync

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

136246

Message:

DevBusLogic: Corrected R0 port handler registration.

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (4 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
- * @param   fNoComplStat    Flag to suppress command completion status as well
+ * @param   fSuppressCMDC   Flag to suppress command completion status as well
  */
 static void buslogicCommandComplete(PPDMDEVINS pDevIns, PBUSLOGIC pThis, bool fSuppressIrq, bool fSuppressCMDC)
@@ -1201 +1201 @@
     pThis->iReply = 0;
 
-    /* Some commands do not set CMDC when successful. */
+    /* The Enable OMBR command does not set CMDC when successful. */
     if (!fSuppressCMDC)
     {
@@ -4380 +4380 @@
     if (!pThis->uIsaIrq)
     {
-        Assert(pThis->hIoPortsIsa == NIL_IOMIOPORTHANDLE);
-
         int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsPci, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
         AssertRCReturn(rc, rc);
@@ -4388 +4386 @@
         AssertRCReturn(rc, rc);
     }
-    else
-    {
-        Assert(pThis->hIoPortsPci == NIL_IOMIOPORTHANDLE);
-        Assert(pThis->hMmio       == NIL_IOMMMIOHANDLE);
-
-        int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsIsa, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
-        AssertRCReturn(rc, rc);
-    }
+
+    int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsIsa, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
+    AssertRCReturn(rc, rc);
 
     return VINF_SUCCESS;