Changeset 82153 in vbox for trunk/src

Timestamp:

Nov 25, 2019 8:14:42 AM (5 years ago)

Author:

vboxsync

Message:

DevBusLogic: Fixed R0 setup in ISA-only mode.

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (1 diff)

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

@@ -4356 +4356 @@
     PBUSLOGIC pThis = PDMDEVINS_2_DATA(pDevIns, PBUSLOGIC);
 
-    int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsPci, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
-    AssertRCReturn(rc, rc);
-
-    rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmio, buslogicMMIOWrite, buslogicMMIORead, NULL /*pvUser*/);
-    AssertRCReturn(rc, rc);
+    if (!pThis->uIsaIrq) {
+        int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsPci, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
+        AssertRCReturn(rc, rc);
+
+        rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmio, buslogicMMIOWrite, buslogicMMIORead, NULL /*pvUser*/);
+        AssertRCReturn(rc, rc);
+    }
+    else
+    {
+        int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortsIsa, buslogicIOPortWrite, buslogicIOPortRead, NULL /*pvUser*/);
+        AssertRCReturn(rc, rc);
+    }
 
     return VINF_SUCCESS;