Changeset 40956 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Apr 16, 2012 10:58:48 PM (13 years ago)

Author:

vboxsync

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

77510

Message:

PDM,APIC,IO-APIC: More IRQ tagging.

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp

@@ -240 +240 @@
 
 /** @interface_method_impl{PDMAPICHLPR3,pfnCalcIrqTag} */
-static DECLCALLBACK(uint32_t) pdmR3ApicHlp_CalcIrqTag(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    PVM pVM = pDevIns->Internal.s.pVMR3;
+static DECLCALLBACK(uint32_t) pdmR3ApicHlp_CalcIrqTag(PPDMDEVINS pDevIns, uint8_t u8Level)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    Assert(u8Level == PDM_IRQ_LEVEL_HIGH || u8Level == PDM_IRQ_LEVEL_FLIP_FLOP);
 
     pdmLock(pVM);
+
     uint32_t uTagSrc = pdmCalcIrqTag(pVM, pDevIns->idTracing);
+    if (u8Level == PDM_IRQ_LEVEL_HIGH)
+        VBOXVMM_PDM_IRQ_HIGH(VMMGetCpu(pVM), RT_LOWORD(uTagSrc), RT_HIWORD(uTagSrc));
+    else
+        VBOXVMM_PDM_IRQ_HILO(VMMGetCpu(pVM), RT_LOWORD(uTagSrc), RT_HIWORD(uTagSrc));
+
+
     pdmUnlock(pVM);
-
-    LogFlow(("pdmR3ApicHlp_CalcIrqTag: caller='%s'/%d: returns %#x\n", pDevIns->pReg->szName, pDevIns->iInstance, uTagSrc));
+    LogFlow(("pdmR3ApicHlp_CalcIrqTag: caller='%s'/%d: returns %#x (u8Level=%d)\n", 
+             pDevIns->pReg->szName, pDevIns->iInstance, uTagSrc, u8Level));
     return uTagSrc;
 }