Changeset 27254 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 10, 2010 3:03:11 PM (15 years ago)

Author:

vboxsync

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

58644

Message:

HPET: correct interrupts delivery

Location:

trunk/src/VBox/VMM

Files:

• PDMDevHlp.cpp (modified) (2 diffs)
• PDMDevMiscHlp.cpp (modified) (2 diffs)
• VMMAll/PDMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -1306 +1306 @@
 
     PVM pVM = pDevIns->Internal.s.pVMR3;
-    PDMIsaSetIrq(pVM, iIrq, iLevel, true);    /* (The API takes the lock.) */
+    PDMIsaSetIrq(pVM, iIrq, iLevel);    /* (The API takes the lock.) */
 
     LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance));
@@ -3167 +3167 @@
     {
         case PDMDEVHLPTASKOP_ISA_SET_IRQ:
-            PDMIsaSetIrq(pVM, pTask->u.SetIRQ.iIrq, pTask->u.SetIRQ.iLevel, true /* ISA source */);
+            PDMIsaSetIrq(pVM, pTask->u.SetIRQ.iIrq, pTask->u.SetIRQ.iLevel);
             break;
 

trunk/src/VBox/VMM/PDMDevMiscHlp.cpp

@@ -459 +459 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     Log4(("pdmR3PciHlp_IsaSetIrq: iIrq=%d iLevel=%d\n", iIrq, iLevel));
-    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel,  /* ISA source */ true);
+    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel);
 }
 
@@ -598 +598 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     LogFlow(("pdmR3HpetHlp_SetIrq: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, iIrq, iLevel));
-    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel, false /* Non-ISA source */);
+    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel);
     return 0;
 }

trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

@@ -100 +100 @@
  * @param   u8Level         The new level.
  */
-VMMDECL(int) PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level, bool fIsaSource)
+VMMDECL(int) PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level)
 {
     pdmLock(pVM);
@@ -124 +124 @@
          * If changing, also update override rules in MADT and MPS.
          */
-        if (fIsaSource)
-        {
-            /* ISA IRQ0 routed to pin 2, all others ISA sources are identity mapped */
-            if (u8Irq == 0)
-                u8Irq = 2;
-        }
+        /* ISA IRQ0 routed to pin 2, all others ISA sources are identity mapped */
+        if (u8Irq == 0)
+            u8Irq = 2;
+
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Irq, u8Level);
         rc = VINF_SUCCESS;