Changeset 10492 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 11, 2008 8:14:13 AM (17 years ago)

Author:

vboxsync

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

33170

Message:

Added PDMApicHasPendingIrq.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -267 +267 @@
 PDMBOTHCBDECL(int)  apicMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
 PDMBOTHCBDECL(int)  apicGetInterrupt(PPDMDEVINS pDevIns);
+PDMBOTHCBDECL(bool) apicHasPendingIrq(PPDMDEVINS pDevIns);
 PDMBOTHCBDECL(void) apicSetBase(PPDMDEVINS pDevIns, uint64_t val);
 PDMBOTHCBDECL(uint64_t) apicGetBase(PPDMDEVINS pDevIns);
@@ -761 +762 @@
     return intno;
 }
+
+/* Check if the APIC has a pending interrupt/if a TPR change would active one. */
+PDMBOTHCBDECL(bool) apicHasPendingIrq(PPDMDEVINS pDevIns)
+{
+    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    return false;
+}
+
 
 static uint32_t apic_get_current_count(APICState *s)
@@ -1680 +1689 @@
      * Register the APIC.
      */
-    ApicReg.u32Version          = PDM_APICREG_VERSION;
-    ApicReg.pfnGetInterruptHC   = apicGetInterrupt;
-    ApicReg.pfnSetBaseHC        = apicSetBase;
-    ApicReg.pfnGetBaseHC        = apicGetBase;
-    ApicReg.pfnSetTPRHC         = apicSetTPR;
-    ApicReg.pfnGetTPRHC         = apicGetTPR;
-    ApicReg.pfnBusDeliverHC     = apicBusDeliverCallback;
+    ApicReg.u32Version              = PDM_APICREG_VERSION;
+    ApicReg.pfnGetInterruptHC       = apicGetInterrupt;
+    ApicReg.pfnHasPendingIrqHC      = apicHasPendingIrq;
+    ApicReg.pfnSetBaseHC            = apicSetBase;
+    ApicReg.pfnGetBaseHC            = apicGetBase;
+    ApicReg.pfnSetTPRHC             = apicSetTPR;
+    ApicReg.pfnGetTPRHC             = apicGetTPR;
+    ApicReg.pfnBusDeliverHC         = apicBusDeliverCallback;
     if (fGCEnabled) {
         ApicReg.pszGetInterruptGC   = "apicGetInterrupt";
+        ApicReg.pszHasPendingIrqGC  = "apicHasPendingIrq";
         ApicReg.pszSetBaseGC        = "apicSetBase";
         ApicReg.pszGetBaseGC        = "apicGetBase";
@@ -1696 +1707 @@
     } else {
         ApicReg.pszGetInterruptGC   = NULL;
+        ApicReg.pszHasPendingIrqGC  = NULL;
         ApicReg.pszSetBaseGC        = NULL;
         ApicReg.pszGetBaseGC        = NULL;
@@ -1704 +1716 @@
     if (fR0Enabled) {
         ApicReg.pszGetInterruptR0   = "apicGetInterrupt";
+        ApicReg.pszHasPendingIrqR0  = "apicHasPendingIrq";
         ApicReg.pszSetBaseR0        = "apicSetBase";
         ApicReg.pszGetBaseR0        = "apicGetBase";
@@ -1711 +1724 @@
     } else {
         ApicReg.pszGetInterruptR0   = NULL;
+        ApicReg.pszHasPendingIrqR0  = NULL;
         ApicReg.pszSetBaseR0        = NULL;
         ApicReg.pszGetBaseR0        = NULL;