Changeset 11155
- Timestamp:
- 08/06/08 01:00:44 (4 months ago)
- Files:
-
- trunk/include/VBox/tm.h (modified) (1 diff)
- trunk/include/VBox/types.h (modified) (2 diffs)
- trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)
- trunk/src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (1 diff)
- trunk/src/VBox/VMM/VMMAll/TMAll.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/VBox/tm.h
r8155 r11155 171 171 TMDECL(PTMTIMERR3) TMTimerR3Ptr(PTMTIMER pTimer); 172 172 TMDECL(PTMTIMERR0) TMTimerR0Ptr(PTMTIMER pTimer); 173 TMDECL(PTMTIMERGC) TMTimerGCPtr(PTMTIMER pTimer); 173 TMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer); 174 #define TMTimerGCPtr(pTimer) TMTimerRCPtr(pTimer) /**< @deprecated */ 174 175 TMDECL(int) TMTimerDestroy(PTMTIMER pTimer); 175 176 TMDECL(int) TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire); trunk/include/VBox/types.h
r10963 r11155 138 138 /** R0 pointer to a PDM Device Instance. */ 139 139 typedef R0PTRTYPE(PPDMDEVINS) PPDMDEVINSR0; 140 /** GC pointer to a PDM Device Instance. */ 141 typedef RCPTRTYPE(PPDMDEVINS) PPDMDEVINSGC; 140 /** RC pointer to a PDM Device Instance. */ 141 typedef RCPTRTYPE(PPDMDEVINS) PPDMDEVINSRC; 142 /** @deprecated */ 143 typedef PPDMDEVINSRC PPDMDEVINSGC; 142 144 143 145 /** Pointer to a PDM USB Device Instance. */ … … 166 168 typedef PTMTIMERR0 *PPTMTIMERR0; 167 169 168 /** GC pointer to a timer. */ 169 typedef RCPTRTYPE(struct TMTIMER *) PTMTIMERGC; 170 /** Pointer to a GC pointer to a timer. */ 171 typedef PTMTIMERGC *PPTMTIMERGC; 170 /** RC pointer to a timer. */ 171 typedef RCPTRTYPE(struct TMTIMER *) PTMTIMERRC; 172 /** Pointer to a RC pointer to a timer. */ 173 typedef PTMTIMERRC *PPTMTIMERRC; 174 /** @deprecated */ 175 typedef PTMTIMERRC PTMTIMERGC; 172 176 173 177 /** Pointer to a timer. */ 174 178 typedef CTXALLSUFF(PTMTIMER) PTMTIMER; 175 179 /** Pointer to a pointer to a timer. */ 176 typedef CTXALLSUFF(PPTMTIMER)PPTMTIMER;180 typedef PTMTIMER *PPTMTIMER; 177 181 178 182 /** SSM Operation handle. */ trunk/src/VBox/Devices/PC/DevAPIC.cpp
r10665 r11155 197 197 PCPDMAPICHLPGC pApicHlpGC; 198 198 /** The APIC timer - GC Ptr. */ 199 PTMTIMER GC pTimerGC;199 PTMTIMERRC pTimerGC; 200 200 201 201 /** Number of attempts made to optimize TPR accesses. */ … … 561 561 562 562 APICState *s = PDMINS2DATA(pDevIns, APICState *); 563 if (!s) 563 if (!s) 564 564 return false; 565 565 trunk/src/VBox/Devices/PC/DevPit-i8254.cpp
r9212 r11155 89 89 RCPTRTYPE(struct PITState *) pPitGC; 90 90 /** The timer - HCPtr. */ 91 PTMTIMER GC pTimerGC;91 PTMTIMERRC pTimerGC; 92 92 /** The virtual time stamp at the last reload. (only used in mode 2 for now) */ 93 93 uint64_t u64ReloadTS; trunk/src/VBox/VMM/VMMAll/TMAll.cpp
r8155 r11155 362 362 363 363 /** 364 * Gets the GC pointer of the timer.365 * 366 * @returns GC pointer.364 * Gets the RC pointer of the timer. 365 * 366 * @returns RC pointer. 367 367 * @param pTimer Timer handle as returned by one of the create functions. 368 368 */ 369 TMDECL(PTMTIMER GC) TMTimerGCPtr(PTMTIMER pTimer)370 { 371 return (PTMTIMER GC)MMHyperCCToGC(pTimer->CTXALLSUFF(pVM), pTimer);369 TMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer) 370 { 371 return (PTMTIMERRC)MMHyperCCToRC(pTimer->CTXALLSUFF(pVM), pTimer); 372 372 } 373 373
