Changeset 11261 in vbox for trunk/include

Timestamp:

Aug 8, 2008 3:46:17 PM (16 years ago)

Author:

vboxsync

Message:

#1865: DevPIC.

File:

• trunk/include/VBox/pdmdev.h (modified) (16 diffs)

trunk/include/VBox/pdmdev.h

@@ -671 +671 @@
      *
      * This should be called at both construction and relocation time
-     * to obtain the correct address of the GC helpers.
+     * to obtain the correct address of the R0 helpers.
      *
      * @returns R0 pointer to the PCI Bus helpers.
@@ -685 +685 @@
      * @returns Fatal error on failure.
      * @param   pDevIns         The PCI device instance.
-     * @param   rc              Dummy for making the interface identical to the GC and R0 versions.
+     * @param   rc              Dummy for making the interface identical to the RC and R0 versions.
      */
     DECLR3CALLBACKMEMBER(int,   pfnLock,(PPDMDEVINS pDevIns, int rc));
@@ -723 +723 @@
      * @param   iLevel          IRQ level. See the PDM_IRQ_LEVEL_* \#defines.
      */
-    DECLR3CALLBACKMEMBER(void, pfnSetIrqHC,(PPDMDEVINS pDevIns, int iIrq, int iLevel));
+    DECLR3CALLBACKMEMBER(void, pfnSetIrqR3,(PPDMDEVINS pDevIns, int iIrq, int iLevel));
 
     /**
@@ -731 +731 @@
      * @param   pDevIns         Device instance of the PIC.
      */
-    DECLR3CALLBACKMEMBER(int, pfnGetInterruptHC,(PPDMDEVINS pDevIns));
-
-    /** The name of the GC SetIrq entry point. */
-    const char         *pszSetIrqGC;
-    /** The name of the GC GetInterrupt entry point. */
-    const char         *pszGetInterruptGC;
+    DECLR3CALLBACKMEMBER(int, pfnGetInterruptR3,(PPDMDEVINS pDevIns));
+
+    /** The name of the RC SetIrq entry point. */
+    const char         *pszSetIrqRC;
+    /** The name of the RC GetInterrupt entry point. */
+    const char         *pszGetInterruptRC;
 
     /** The name of the R0 SetIrq entry point. */
@@ -750 +750 @@
 
 /**
- * PIC GC helpers.
- */
-typedef struct PDMPICHLPGC
-{
-    /** Structure version. PDM_PICHLPGC_VERSION defines the current version. */
+ * PIC RC helpers.
+ */
+typedef struct PDMPICHLPRC
+{
+    /** Structure version. PDM_PICHLPRC_VERSION defines the current version. */
     uint32_t                u32Version;
 
@@ -790 +790 @@
     /** Just a safety precaution. */
     uint32_t                u32TheEnd;
-} PDMPICHLPGC;
-
-/** Pointer to PIC GC helpers. */
-typedef RCPTRTYPE(PDMPICHLPGC *) PPDMPICHLPGC;
-/** Pointer to const PIC GC helpers. */
-typedef RCPTRTYPE(const PDMPICHLPGC *) PCPDMPICHLPGC;
-
-/** Current PDMPICHLPGC version number. */
-#define PDM_PICHLPGC_VERSION  0xfc010000
+} PDMPICHLPRC;
+
+/** Pointer to PIC RC helpers. */
+typedef RCPTRTYPE(PDMPICHLPRC *) PPDMPICHLPRC;
+/** Pointer to const PIC RC helpers. */
+typedef RCPTRTYPE(const PDMPICHLPRC *) PCPDMPICHLPRC;
+
+/** Current PDMPICHLPRC version number. */
+#define PDM_PICHLPRC_VERSION  0xfc010000
 
 
@@ -853 +853 @@
 
 /**
- * PIC HC helpers.
+ * PIC R3 helpers.
  */
 typedef struct PDMPICHLPR3
@@ -880 +880 @@
      * @returns Fatal error on failure.
      * @param   pDevIns         The PIC device instance.
-     * @param   rc              Dummy for making the interface identical to the GC and R0 versions.
+     * @param   rc              Dummy for making the interface identical to the RC and R0 versions.
      */
     DECLR3CALLBACKMEMBER(int,   pfnLock,(PPDMDEVINS pDevIns, int rc));
@@ -892 +892 @@
 
     /**
-     * Gets the address of the GC PIC helpers.
+     * Gets the address of the RC PIC helpers.
      *
      * This should be called at both construction and relocation time
-     * to obtain the correct address of the GC helpers.
-     *
-     * @returns GC pointer to the PIC helpers.
+     * to obtain the correct address of the RC helpers.
+     *
+     * @returns RC pointer to the PIC helpers.
      * @param   pDevIns         Device instance of the PIC.
      */
-    DECLR3CALLBACKMEMBER(PCPDMPICHLPGC, pfnGetGCHelpers,(PPDMDEVINS pDevIns));
+    DECLR3CALLBACKMEMBER(PCPDMPICHLPRC, pfnGetRCHelpers,(PPDMDEVINS pDevIns));
 
     /**
@@ -906 +906 @@
      *
      * This should be called at both construction and relocation time
-     * to obtain the correct address of the GC helpers.
+     * to obtain the correct address of the R0 helpers.
      *
      * @returns R0 pointer to the PIC helpers.
@@ -917 +917 @@
 } PDMPICHLPR3;
 
-/** Pointer to PIC HC helpers. */
+/** Pointer to PIC R3 helpers. */
 typedef R3PTRTYPE(PDMPICHLPR3 *) PPDMPICHLPR3;
-/** Pointer to const PIC HC helpers. */
+/** Pointer to const PIC R3 helpers. */
 typedef R3PTRTYPE(const PDMPICHLPR3 *) PCPDMPICHLPR3;
 
@@ -1282 +1282 @@
      * Private interface between the IOAPIC and APIC.
      *
-     * See comments about this hack on PDMAPICREG::pfnBusDeliverHC.
+     * See comments about this hack on PDMAPICREG::pfnBusDeliverR3.
      *
      * @returns The current TPR.
@@ -1336 +1336 @@
      * Private interface between the IOAPIC and APIC.
      *
-     * See comments about this hack on PDMAPICREG::pfnBusDeliverHC.
+     * See comments about this hack on PDMAPICREG::pfnBusDeliverR3.
      *
      * @returns The current TPR.
@@ -1379 +1379 @@
 
 /**
- * IOAPIC HC helpers.
+ * IOAPIC R3 helpers.
  */
 typedef struct PDMIOAPICHLPR3
@@ -1389 +1389 @@
      * Private interface between the IOAPIC and APIC.
      *
-     * See comments about this hack on PDMAPICREG::pfnBusDeliverHC.
+     * See comments about this hack on PDMAPICREG::pfnBusDeliverR3.
      *
      * @returns The current TPR.
@@ -1445 +1445 @@
     uint32_t                u32TheEnd;
 } PDMIOAPICHLPR3;
-/** Pointer to IOAPIC HC helpers. */
+/** Pointer to IOAPIC R3 helpers. */
 typedef R3PTRTYPE(PDMIOAPICHLPR3 *) PPDMIOAPICHLPR3;
 /** Pointer to const IOAPIC helpers. */