Changeset 13832 in vbox for trunk/include/VBox
- Timestamp:
- Nov 5, 2008 2:01:12 AM (16 years ago)
- Location:
- trunk/include/VBox
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/cpum.h
r13830 r13832 975 975 #endif /* IN_RING3 */ 976 976 977 #ifdef IN_ GC977 #ifdef IN_RC 978 978 /** @defgroup grp_cpum_gc The CPU Monitor(/Manager) API 979 979 * @ingroup grp_cpum … … 998 998 999 999 /** @} */ 1000 #endif /* IN_ GC */1000 #endif /* IN_RC */ 1001 1001 1002 1002 #ifdef IN_RING0 -
trunk/include/VBox/dbgf.h
r13005 r13832 45 45 */ 46 46 47 #ifdef IN_ GC47 #ifdef IN_RC 48 48 /** @addgroup grp_dbgf_gc The GC DBGF API 49 49 * @ingroup grp_dbgf -
trunk/include/VBox/em.h
r13778 r13832 202 202 203 203 204 #ifdef IN_ GC204 #ifdef IN_RC 205 205 /** @defgroup grp_em_gc The EM Guest Context API 206 206 * @ingroup grp_em … … 215 215 VMMRCDECL(uint32_t) EMGCEmulateXAdd(RTRCPTR pu32Param1, uint32_t *pu32Param2, size_t cbSize, uint32_t *pEflags); 216 216 /** @} */ 217 #endif /* IN_ GC */217 #endif /* IN_RC */ 218 218 219 219 /** @} */ -
trunk/include/VBox/hwaccm.h
r13800 r13832 69 69 VMMDECL(bool) HWACCMHasPendingIrq(PVM pVM); 70 70 71 #ifndef IN_ GC71 #ifndef IN_RC 72 72 VMMDECL(int) HWACCMFlushTLB(PVM pVM); 73 73 VMMDECL(int) HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys); -
trunk/include/VBox/iom.h
r13414 r13832 217 217 VMMDECL(int) IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys); 218 218 219 #ifdef IN_ GC219 #ifdef IN_RC 220 220 /** @defgroup grp_iom_gc The IOM Guest Context API 221 221 * @ingroup grp_iom … … 224 224 VMMRCDECL(int) IOMGCIOPortHandler(PVM pVM, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu); 225 225 /** @} */ 226 #endif /* IN_ GC */226 #endif /* IN_RC */ 227 227 228 228 -
trunk/include/VBox/mm.h
r13827 r13832 238 238 239 239 240 #ifndef IN_ GC240 #ifndef IN_RC 241 241 VMMDECL(void *) MMHyperRCToCC(PVM pVM, RTRCPTR RCPtr); 242 242 #else … … 268 268 #endif 269 269 270 #ifndef IN_ GC270 #ifndef IN_RC 271 271 VMMDECL(RTRCPTR) MMHyperCCToRC(PVM pVM, void *pv); 272 272 #else … … 299 299 /** @def MMHYPER_RC_ASSERT_RCPTR 300 300 * Asserts that an address is either NULL or inside the hypervisor memory area. 301 * This assertion only works while IN_ GC, it's a NOP everywhere else.301 * This assertion only works while IN_RC, it's a NOP everywhere else. 302 302 * @thread The Emulation Thread. 303 303 */ 304 #ifdef IN_ GC304 #ifdef IN_RC 305 305 # define MMHYPER_RC_ASSERT_RCPTR(pVM, RCPtr) Assert(MMHyperIsInsideArea((pVM), (RTRCUINTPTR)(RCPtr)) || !(RCPtr)) 306 306 #else … … 405 405 406 406 407 #ifdef IN_ GC407 #ifdef IN_RC 408 408 /** @defgroup grp_mm_gc The MM Guest Context API 409 409 * @ingroup grp_mm … … 419 419 420 420 /** @} */ 421 #endif /* IN_ GC */421 #endif /* IN_RC */ 422 422 423 423 /** @} */ -
trunk/include/VBox/patm.h
r12989 r13832 292 292 #endif 293 293 294 #ifdef IN_ GC294 #ifdef IN_RC 295 295 /** @defgroup grp_patm_gc The Patch Manager API 296 296 * @ingroup grp_patm -
trunk/include/VBox/pdmapi.h
r13020 r13832 120 120 121 121 122 #ifdef IN_ GC122 #ifdef IN_RC 123 123 /** @defgroup grp_pdm_gc The PDM Guest Context API 124 124 * @ingroup grp_pdm -
trunk/include/VBox/pdmins.h
r13005 r13832 39 39 * Macro for declaring a callback which is static in HC and exported in GC. 40 40 */ 41 #if defined(IN_ GC) || defined(IN_RING0)41 #if defined(IN_RC) || defined(IN_RING0) 42 42 # define PDMBOTHCBDECL(type) DECLEXPORT(type) 43 43 #else -
trunk/include/VBox/pgm.h
r13778 r13832 385 385 { 386 386 /** @todo see PGMPhysIsPageMappingLockValid for possibly incorrect assumptions */ 387 #ifdef IN_ GC387 #ifdef IN_RC 388 388 /** Just a dummy for the time being. */ 389 389 uint32_t u32Dummy; … … 413 413 { 414 414 /** @todo -> complete/change this */ 415 #ifdef IN_ GC415 #ifdef IN_RC 416 416 return !!(pLock->u32Dummy); 417 417 #else … … 426 426 VMMDECL(void) PGMPhysRead(PVM pVM, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead); 427 427 VMMDECL(void) PGMPhysWrite(PVM pVM, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite); 428 #ifndef IN_ GC /* Only ring 0 & 3. */428 #ifndef IN_RC /* Only ring 0 & 3. */ 429 429 VMMDECL(int) PGMPhysSimpleReadGCPhys(PVM pVM, void *pvDst, RTGCPHYS GCPhysSrc, size_t cb); 430 430 VMMDECL(int) PGMPhysSimpleWriteGCPhys(PVM pVM, RTGCPHYS GCPhysDst, const void *pvSrc, size_t cb); … … 434 434 VMMDECL(int) PGMPhysWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb); 435 435 VMMDECL(int) PGMPhysSimpleDirtyWriteGCPtr(PVM pVM, RTGCPTR GCPtrDst, const void *pvSrc, size_t cb); 436 #endif /* !IN_ GC */436 #endif /* !IN_RC */ 437 437 VMMDECL(int) PGMPhysInterpretedRead(PVM pVM, PCPUMCTXCORE pCtxCore, void *pvDst, RTGCUINTPTR GCPtrSrc, size_t cb); 438 438 #ifdef VBOX_STRICT … … 442 442 #endif /* VBOX_STRICT */ 443 443 444 #if defined(IN_ GC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE)444 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE) 445 445 VMMDECL(int) PGMDynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv); 446 446 VMMDECL(int) PGMDynMapGCPageOff(PVM pVM, RTGCPHYS GCPhys, void **ppv); … … 450 450 451 451 452 #ifdef IN_ GC452 #ifdef IN_RC 453 453 /** @defgroup grp_pgm_gc The PGM Guest Context API 454 454 * @ingroup grp_pgm … … 456 456 */ 457 457 /** @} */ 458 #endif /* IN_ GC */458 #endif /* IN_RC */ 459 459 460 460 -
trunk/include/VBox/rem.h
r13565 r13832 47 47 48 48 49 #if defined(IN_RING0) || defined(IN_ GC)49 #if defined(IN_RING0) || defined(IN_RC) 50 50 VMMDECL(int) REMNotifyInvalidatePage(PVM pVM, RTGCPTR GCPtrPage); 51 51 VMMDECL(void) REMNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler); 52 52 VMMDECL(void) REMNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM); 53 53 VMMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM); 54 #endif /* IN_RING0 || IN_ GC */54 #endif /* IN_RING0 || IN_RC */ 55 55 VMMDECL(void) REMFlushTBs(PVM pVM); 56 56 -
trunk/include/VBox/trpm.h
r13635 r13832 114 114 115 115 116 #ifdef IN_ GC116 #ifdef IN_RC 117 117 /** @defgroup grp_trpm_gc The TRPM Guest Context API 118 118 * @ingroup grp_trpm -
trunk/include/VBox/vm.h
r13831 r13832 359 359 * code to let threads other than EMT mess around with the VM. 360 360 */ 361 #ifdef IN_ GC361 #ifdef IN_RC 362 362 # define VM_IS_EMT(pVM) true 363 363 #elif defined(IN_RING0) … … 371 371 * Asserts that the current thread IS the emulation thread (EMT). 372 372 */ 373 #ifdef IN_ GC373 #ifdef IN_RC 374 374 # define VM_ASSERT_EMT(pVM) Assert(VM_IS_EMT(pVM)) 375 375 #elif defined(IN_RING0) … … 384 384 * Asserts that the current thread IS the emulation thread (EMT) and returns if it isn't. 385 385 */ 386 #ifdef IN_ GC386 #ifdef IN_RC 387 387 # define VM_ASSERT_EMT_RETURN(pVM, rc) AssertReturn(VM_IS_EMT(pVM), (rc)) 388 388 #elif defined(IN_RING0) … … 400 400 * @todo r=bird: See VMMGetCpuId(). 401 401 */ 402 #ifdef IN_ GC402 #ifdef IN_RC 403 403 # define VM_GET_VMCPUID(pVM) 0 404 404 #elif defined(IN_RING0) … … 788 788 789 789 790 #ifdef IN_ GC790 #ifdef IN_RC 791 791 __BEGIN_DECLS 792 792 -
trunk/include/VBox/vmapi.h
r13830 r13832 68 68 * @param pvInVM CC pointer within the VM. 69 69 */ 70 #ifdef IN_ GC70 #ifdef IN_RC 71 71 # define VM_R3_ADDR(pVM, pvInVM) ( (RTR3PTR)((RTR3UINTPTR)pVM->pVMR3 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) ) 72 72 #elif defined(IN_RING0) … … 85 85 * @param pvInVM CC pointer within the VM. 86 86 */ 87 #ifdef IN_ GC87 #ifdef IN_RC 88 88 # define VM_R0_ADDR(pVM, pvInVM) ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) ) 89 89 #elif defined(IN_RING3) … … 313 313 314 314 315 #ifndef IN_ GC315 #ifndef IN_RC 316 316 /** @defgroup grp_vmm_apis_hc VM Host Context API 317 317 * @ingroup grp_vm … … 425 425 426 426 427 #ifdef IN_ GC427 #ifdef IN_RC 428 428 /** @defgroup grp_vmm_apis_gc VM Guest Context APIs 429 429 * @ingroup grp_vm -
trunk/include/VBox/vmm.h
r13813 r13832 284 284 285 285 286 #ifdef IN_ GC286 #ifdef IN_RC 287 287 /** @defgroup grp_vmm_rc The VMM Raw-Mode Context API 288 288 * @ingroup grp_vmm -
trunk/include/VBox/vrdpapi.h
r12297 r13832 38 38 # error "There are no VRDP APIs available in Ring-0 Host Context!" 39 39 #endif 40 #ifdef IN_ GC40 #ifdef IN_RC 41 41 # error "There are no VRDP APIs available Guest Context!" 42 42 #endif … … 338 338 #define VRDP_USB_XFER_BO (10) 339 339 #define VRDP_USB_XFER_BU (11) 340 #define VRDP_USB_XFER_ERR (12) /* VBox protocol error. */ 340 #define VRDP_USB_XFER_ERR (12) /* VBox protocol error. */ 341 341 342 342 #define VRDP_USB_REAP_FLAG_CONTINUED (0x0) … … 472 472 { 473 473 uint8_t flags; 474 uint32_t u32Version; /* This field presents only if the VRDP_USB_CAPS2_FLAG_VERSION flag is set. */ 474 uint32_t u32Version; /* This field presents only if the VRDP_USB_CAPS2_FLAG_VERSION flag is set. */ 475 475 } VRDPUSBREQNEGOTIATERET_2; 476 476 #pragma pack() … … 611 611 * @param hServer The server instance handle. 612 612 * @param u32ClientId The client identifier. 613 * @param fReconnect Whether to send a "REDIRECT to the same server" packet to the 613 * @param fReconnect Whether to send a "REDIRECT to the same server" packet to the 614 614 * client before disconnecting. 615 615 * … … 747 747 } VRDPENTRYPOINTS_1; 748 748 749 /** The VRDP server entry points. Interface version 2. 749 /** The VRDP server entry points. Interface version 2. 750 750 * A new entry point VRDPRedirect has been added relative to version 1. 751 751 */ … … 778 778 * @param hServer The server instance handle. 779 779 * @param u32ClientId The client identifier. 780 * @param fReconnect Whether to send a "REDIRECT to the same server" packet to the 780 * @param fReconnect Whether to send a "REDIRECT to the same server" packet to the 781 781 * client before disconnecting. 782 782 * … … 1012 1012 1013 1013 /* A client is logging in, the application must decide whether 1014 * to let to connect the client. The server will drop the connection, 1014 * to let to connect the client. The server will drop the connection, 1015 1015 * when an error code is returned by the callback. 1016 1016 * … … 1151 1151 DECLR3CALLBACKMEMBER(void, VRDPCallbackVideoModeHint,(void *pvCallback, 1152 1152 unsigned cWidth, 1153 unsigned cHeight, 1153 unsigned cHeight, 1154 1154 unsigned cBitsPerPixel, 1155 1155 unsigned uScreenId)); -
trunk/include/VBox/vrdpusb.h
r8155 r13832 38 38 # error "There are no VRDP APIs available in Ring-0 Host Context!" 39 39 #endif 40 #ifdef IN_ GC40 #ifdef IN_RC 41 41 # error "There are no VRDP APIs available Guest Context!" 42 42 #endif
Note:
See TracChangeset
for help on using the changeset viewer.