Changeset 107308 in vbox for trunk/include/VBox/vmm

Timestamp:

Dec 13, 2024 8:09:39 AM (3 months ago)

Author:

vboxsync

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

166339

Message:

VMM: bugref:10759 Refactor GIC for use with different backends.

Location:

trunk/include/VBox/vmm

Files:

• gic.h (deleted)
• pdmapic.h (modified) (1 diff)
• pdmdev.h (modified) (6 diffs)
• pdmgic.h (added)

trunk/include/VBox/vmm/pdmapic.h

@@ -844 +844 @@
     DECLRCCALLBACKMEMBER(int, pfnReserved9, (void));
     DECLRCCALLBACKMEMBER(int, pfnReserved10, (void));
+    DECLRCCALLBACKMEMBER(int, pfnReserved11, (void));
+    DECLRCCALLBACKMEMBER(int, pfnReserved12, (void));
     /** @} */
 } PDMAPICBACKENDRC;

trunk/include/VBox/vmm/pdmdev.h

@@ -752 +752 @@
 #endif
 
-/**
- * The PDM APIC device registration structure.
- */
+#if defined(VBOX_VMM_TARGET_X86) || defined(VBOX_VMM_TARGET_AGNOSTIC)
+/** The PDM APIC device registration structure. */
 extern const PDMDEVREG g_DeviceAPIC;
+#elif defined(VBOX_VMM_TARGET_ARMV8)
+/** The PDM GIC device registration structure. */
+extern const PDMDEVREG g_DeviceGIC;
+/** The PDM GIC NEM device registration structure. */
+extern const PDMDEVREG g_DeviceGICNem;
+#endif
 
 /**
@@ -4264 +4269 @@
 
     /**
-     * Register the APIC device.
-     *
-     * @returns VBox status code.
-     * @param   pDevIns             The device instance.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnApicRegister,(PPDMDEVINS pDevIns));
+     * Register the Interrupt Controller device.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns             The device instance.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnIcRegister,(PPDMDEVINS pDevIns));
 
     /**
@@ -5430 +5435 @@
      *
      * This must be called after ring-3 has registered the APIC using
-     * PDMDevHlpApicRegister().
+     * PDMDevHlpIcRegister().
      *
      * @returns VBox status code.
      * @param   pDevIns     The device instance.
      */
-    DECLRCCALLBACKMEMBER(int, pfnApicSetUpContext,(PPDMDEVINS pDevIns));
+    DECLRCCALLBACKMEMBER(int, pfnIcSetUpContext,(PPDMDEVINS pDevIns));
 
     /**
@@ -5926 +5931 @@
      *
      * This must be called after ring-3 has registered the APIC using
-     * PDMDevHlpApicRegister().
+     * PDMDevHlpIcRegister().
      *
      * @returns VBox status code.
      * @param   pDevIns     The device instance.
      */
-    DECLR0CALLBACKMEMBER(int, pfnApicSetUpContext,(PPDMDEVINS pDevIns));
+    DECLR0CALLBACKMEMBER(int, pfnIcSetUpContext,(PPDMDEVINS pDevIns));
 
     /**
@@ -9180 +9185 @@
 
 /**
- * @copydoc PDMDEVHLPR3::pfnApicRegister
- */
-DECLINLINE(int) PDMDevHlpApicRegister(PPDMDEVINS pDevIns)
-{
-    return pDevIns->pHlpR3->pfnApicRegister(pDevIns);
+ * @copydoc PDMDEVHLPR3::pfnIcRegister
+ */
+DECLINLINE(int) PDMDevHlpIcRegister(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pHlpR3->pfnIcRegister(pDevIns);
 }
 
@@ -9344 +9349 @@
 
 /**
- * @copydoc PDMDEVHLPR0::pfnApicSetUpContext
- */
-DECLINLINE(int) PDMDevHlpApicSetUpContext(PPDMDEVINS pDevIns)
-{
-    return pDevIns->CTX_SUFF(pHlp)->pfnApicSetUpContext(pDevIns);
+ * @copydoc PDMDEVHLPR0::pfnIcSetUpContext
+ */
+DECLINLINE(int) PDMDevHlpIcSetUpContext(PPDMDEVINS pDevIns)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnIcSetUpContext(pDevIns);
 }