Changeset 30725 in vbox

Timestamp:

Jul 8, 2010 8:56:22 AM (15 years ago)

Author:

vboxsync

Message:

BusLogic: Fix for W2K and ACPI

File:

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

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

@@ -790 +790 @@
  * @returns nothing.
  * @param   pBusLogic  Pointer to the BusLogic device instance.
- */
-static void buslogicSetInterrupt(PBUSLOGIC pBusLogic)
+ * @param   fSuppressIrq    Flag to suppress IRQ generation regardless of fIRQEnabled
+ */
+static void buslogicSetInterrupt(PBUSLOGIC pBusLogic, bool fSuppressIrq)
 {
     LogFlowFunc(("pBusLogic=%#p\n", pBusLogic));
@@ -862 +863 @@
  *
  * @returns nothing.
- * @param   pBusLogic   Pointer to the BusLogic device instance
- */
-static void buslogicCommandComplete(PBUSLOGIC pBusLogic)
+ * @param   pBusLogic       Pointer to the BusLogic device instance
+ * @param   fSuppressIrq    Flag to suppress IRQ generation regardless of current state
+ */
+static void buslogicCommandComplete(PBUSLOGIC pBusLogic, bool fSuppressIrq)
 {
     LogFlowFunc(("pBusLogic=%#p\n", pBusLogic));
@@ -880 +882 @@
         pBusLogic->regInterrupt |= BUSLOGIC_REGISTER_INTERRUPT_COMMAND_COMPLETE;
 
-        buslogicSetInterrupt(pBusLogic);
+        buslogicSetInterrupt(pBusLogic, fSuppressIrq);
     }
 
@@ -941 +943 @@
 
     pBusLogic->regInterrupt |= BUSLOGIC_REGISTER_INTERRUPT_INCOMING_MAILBOX_LOADED;
-    buslogicSetInterrupt(pBusLogic);
+    buslogicSetInterrupt(pBusLogic, false);
 
     PDMCritSectLeave(&pBusLogic->CritSectIntr);
@@ -1264 +1266 @@
 {
     int rc = VINF_SUCCESS;
+    bool fSuppressIrq = false;
 
     LogFlowFunc(("pBusLogic=%#p\n", pBusLogic));
@@ -1451 +1454 @@
             else
                 pBusLogic->fIRQEnabled = true;
+            /* No interrupt signaled regardless of enable/disable. */
+            fSuppressIrq = true;
             break;
         }
@@ -1484 +1489 @@
         pBusLogic->regStatus |= BUSLOGIC_REGISTER_STATUS_DATA_IN_REGISTER_READY;
     else
-        buslogicCommandComplete(pBusLogic);
+        buslogicCommandComplete(pBusLogic, fSuppressIrq);
 
     return rc;
@@ -1534 +1539 @@
                  * interrupt the guest if enabled.
                  */
-                buslogicCommandComplete(pBusLogic);
+                buslogicCommandComplete(pBusLogic, false);
             }
             break;