Changeset 11155 in vbox

Timestamp:

Aug 5, 2008 11:00:44 PM (17 years ago)

Author:

vboxsync

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

34145

Message:

TMTimerRCPtr and some types.

Location:

trunk

Files:

• include/VBox/tm.h (modified) (1 diff)
• include/VBox/types.h (modified) (2 diffs)
• src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)
• src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/TMAll.cpp (modified) (1 diff)

trunk/include/VBox/tm.h

@@ -171 +171 @@
 TMDECL(PTMTIMERR3) TMTimerR3Ptr(PTMTIMER pTimer);
 TMDECL(PTMTIMERR0) TMTimerR0Ptr(PTMTIMER pTimer);
-TMDECL(PTMTIMERGC) TMTimerGCPtr(PTMTIMER pTimer);
+TMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer);
+#define TMTimerGCPtr(pTimer) TMTimerRCPtr(pTimer) /**< @deprecated */
 TMDECL(int) TMTimerDestroy(PTMTIMER pTimer);
 TMDECL(int) TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire);

trunk/include/VBox/types.h

@@ -138 +138 @@
 /** R0 pointer to a PDM Device Instance. */
 typedef R0PTRTYPE(PPDMDEVINS) PPDMDEVINSR0;
-/** GC pointer to a PDM Device Instance. */
-typedef RCPTRTYPE(PPDMDEVINS) PPDMDEVINSGC;
+/** RC pointer to a PDM Device Instance. */
+typedef RCPTRTYPE(PPDMDEVINS) PPDMDEVINSRC;
+/** @deprecated */
+typedef PPDMDEVINSRC PPDMDEVINSGC;
 
 /** Pointer to a PDM USB Device Instance. */
@@ -166 +168 @@
 typedef PTMTIMERR0 *PPTMTIMERR0;
 
-/** GC pointer to a timer. */
-typedef RCPTRTYPE(struct TMTIMER *) PTMTIMERGC;
-/** Pointer to a GC pointer to a timer. */
-typedef PTMTIMERGC *PPTMTIMERGC;
+/** RC pointer to a timer. */
+typedef RCPTRTYPE(struct TMTIMER *) PTMTIMERRC;
+/** Pointer to a RC pointer to a timer. */
+typedef PTMTIMERRC *PPTMTIMERRC;
+/** @deprecated */
+typedef PTMTIMERRC PTMTIMERGC;
 
 /** Pointer to a timer. */
 typedef CTXALLSUFF(PTMTIMER)   PTMTIMER;
 /** Pointer to a pointer to a timer. */
-typedef CTXALLSUFF(PPTMTIMER)  PPTMTIMER;
+typedef PTMTIMER              *PPTMTIMER;
 
 /** SSM Operation handle. */

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

@@ -197 +197 @@
     PCPDMAPICHLPGC  pApicHlpGC;
     /** The APIC timer - GC Ptr. */
-    PTMTIMERGC      pTimerGC;
+    PTMTIMERRC      pTimerGC;
 
     /** Number of attempts made to optimize TPR accesses. */
@@ -561 +561 @@
 
     APICState *s = PDMINS2DATA(pDevIns, APICState *);
-    if (!s) 
+    if (!s)
         return false;
 

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -89 +89 @@
     RCPTRTYPE(struct PITState *)    pPitGC;
     /** The timer - HCPtr. */
-    PTMTIMERGC                      pTimerGC;
+    PTMTIMERRC                      pTimerGC;
     /** The virtual time stamp at the last reload. (only used in mode 2 for now) */
     uint64_t                        u64ReloadTS;

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

@@ -362 +362 @@
 
 /**
- * Gets the GC pointer of the timer.
- *
- * @returns GC pointer.
+ * Gets the RC pointer of the timer.
+ *
+ * @returns RC pointer.
  * @param   pTimer      Timer handle as returned by one of the create functions.
  */
-TMDECL(PTMTIMERGC) TMTimerGCPtr(PTMTIMER pTimer)
-{
-    return (PTMTIMERGC)MMHyperCCToGC(pTimer->CTXALLSUFF(pVM), pTimer);
+TMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer)
+{
+    return (PTMTIMERRC)MMHyperCCToRC(pTimer->CTXALLSUFF(pVM), pTimer);
 }