Changeset 3146

Timestamp:

06/18/07 19:11:26 (2 years ago)

Author:

vboxsync

Message:

Emulate all weird aspects of the IRQ line multiplexing. No guest has
dared to even come close to requiring this, but who knows what the
future brings.

Files:

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

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

@@ -830 +830 @@
-        if (!s->fIrqPending)
-            pCtl->BmDma.u8Status |= BM_STATUS_INT;
-        s->fIrqPending = true;
-        /* Only actually set the IRQ line if updating the currently selected drive. */
-        if (s == &pCtl->aIfs[pCtl->iSelectedIf])
@@ -842 +841 @@
-        }
-    }
+    s->fIrqPending = true;
-}
-
@@ -851 +851 @@
-    PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
-
-s->fIrqPending
+!(s->uATARegDevCtl & ATA_DEVCTL_DISABLE_IRQ)
-    {
-        Log2(("%s: LUN#%d deasserting IRQ\n", __FUNCTION__, s->iLUN));
-        s->fIrqPending = false;
-        /* Only actually unset the IRQ line if updating the currently selected drive. */
-        if (s == &pCtl->aIfs[pCtl->iSelectedIf])
@@ -864 +863 @@
-        }
-    }
+    s->fIrqPending = false;
-}
-
@@ -3011 +3011 @@
-    s->cMultSectors = ATA_MAX_MULT_SECTORS;
-    s->cNotifiedMediaChange = 0;
-    s->fIrqPending = true; /* Ensure that the interrupt is unset. */
-    ataUnsetIRQ(s);
-
@@ -3368 +3367 @@
-                pCtl->iSelectedIf = (val >> 4) & 1;
-                /* The IRQ line is multiplexed between the two drives, so
-
-
+
+
+
+
+
+
-                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                    else
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-            }
@@ -3603 +3615 @@
-        AssertMsgFailed(("RESET handling is too complicated for GC\n"));
-#endif /* IN_RING3 */
+    }
+
+    /* Change of interrupt disable flag. Update interrupt line if interrupt
+     * is pending on the current interface. */
+    if ((val ^ pCtl->aIfs[0].uATARegDevCtl) & ATA_DEVCTL_DISABLE_IRQ
+        &&  pCtl->aIfs[pCtl->iSelectedIf].fIrqPending)
+    {
+        if (!(val & ATA_DEVCTL_DISABLE_IRQ))
+        {
+            Log2(("%s: LUN#%d asserting IRQ (interrupt disable change)\n", __FUNCTION__, pCtl->aIfs[pCtl->iSelectedIf].iLUN));
+            /* The BMDMA unit unconditionally sets BM_STATUS_INT if the
+             * interrupt line is asserted. It monitors the line for a rising
+             * edge. */
+            pCtl->BmDma.u8Status |= BM_STATUS_INT;
+            if (pCtl->irq == 16)
+                PDMDevHlpPCISetIrqNoWait(CONTROLLER_2_DEVINS(pCtl), 0, 1);
+            else
+                PDMDevHlpISASetIrqNoWait(CONTROLLER_2_DEVINS(pCtl), pCtl->irq, 1);
+        }
+        else
+        {
+            Log2(("%s: LUN#%d deasserting IRQ (interrupt disable change)\n", __FUNCTION__, pCtl->aIfs[pCtl->iSelectedIf].iLUN));
+            if (pCtl->irq == 16)
+                PDMDevHlpPCISetIrqNoWait(CONTROLLER_2_DEVINS(pCtl), 0, 0);
+            else
+                PDMDevHlpISASetIrqNoWait(CONTROLLER_2_DEVINS(pCtl), pCtl->irq, 0);
+        }
-    }
-