Changeset 39078 in vbox for trunk/include/VBox/vmm
- Timestamp:
- Oct 21, 2011 2:18:22 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 74507
- Location:
- trunk/include/VBox/vmm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/vmm/mm.h
r37955 r39078 247 247 VMMR3DECL(int) MMR3Term(PVM pVM); 248 248 VMMR3DECL(void) MMR3TermUVM(PUVM pUVM); 249 VMMR3DECL(void) MMR3Reset(PVM pVM);250 249 VMMR3DECL(int) MMR3ReserveHandyPages(PVM pVM, uint32_t cHandyPages); 251 250 VMMR3DECL(int) MMR3IncreaseBaseReservation(PVM pVM, uint64_t cAddBasePages); -
trunk/include/VBox/vmm/pdmdev.h
r39060 r39078 2260 2260 * @param pszRead Name of the RC function which is gonna handle Read operations. 2261 2261 * @param pszFill Name of the RC function which is gonna handle Fill/memset operations. (optional) 2262 * @param pszDesc Obsolete. NULL is fine.2263 * @todo Remove pszDesc in the next major revision of PDMDEVHLPR3.2264 2262 */ 2265 2263 DECLR3CALLBACKMEMBER(int, pfnMMIORegisterRC,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser, 2266 const char *pszWrite, const char *pszRead, const char *pszFill, 2267 const char *pszDesc)); 2264 const char *pszWrite, const char *pszRead, const char *pszFill)); 2268 2265 2269 2266 /** … … 2283 2280 * @param pszFill Name of the RC function which is gonna handle Fill/memset operations. (optional) 2284 2281 * @param pszDesc Obsolete. NULL is fine. 2285 * @todo Remove pszDesc in the next major revision of PDMDEVHLPR3.2286 2282 */ 2287 2283 DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser, 2288 const char *pszWrite, const char *pszRead, const char *pszFill, 2289 const char *pszDesc)); 2284 const char *pszWrite, const char *pszRead, const char *pszFill)); 2290 2285 2291 2286 /** … … 3478 3473 3479 3474 /** Current PDMDEVHLPR3 version number. */ 3480 #define PDM_DEVHLPR3_VERSION PDM_VERSION_MAKE(0xffe7, 7, 0)3475 #define PDM_DEVHLPR3_VERSION PDM_VERSION_MAKE(0xffe7, 8, 0) 3481 3476 3482 3477 … … 4122 4117 const char *pszWrite, const char *pszRead, const char *pszFill) 4123 4118 { 4124 return pDevIns->pHlpR3->pfnMMIORegisterRC(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill , NULL);4119 return pDevIns->pHlpR3->pfnMMIORegisterRC(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill); 4125 4120 } 4126 4121 … … 4131 4126 const char *pszWrite, const char *pszRead, const char *pszFill) 4132 4127 { 4133 return pDevIns->pHlpR3->pfnMMIORegisterR0(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill , NULL);4128 return pDevIns->pHlpR3->pfnMMIORegisterR0(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill); 4134 4129 } 4135 4130 … … 4438 4433 return rc; 4439 4434 # else 4435 NOREF(pDevIns); 4436 NOREF(pszFile); 4437 NOREF(iLine); 4438 NOREF(pszFunction); 4439 NOREF(pszFormat); 4440 4440 return VINF_EM_DBG_STOP; 4441 4441 # endif -
trunk/include/VBox/vmm/pgm.h
r38707 r39078 148 148 * @param enmAccessType The access type. 149 149 * @param pvUser User argument. 150 * 151 * @todo Add pVCpu, possibly replacing pVM. 150 152 */ 151 153 typedef DECLCALLBACK(int) FNPGMR3PHYSHANDLER(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser); … … 183 185 * @param offRange The offset of the access into this range. 184 186 * (If it's a EIP range this is the EIP, if not it's pvFault.) 187 * @todo Add pVCpu, possibly replacing pVM. 185 188 */ 186 189 typedef DECLCALLBACK(int) FNPGMRCVIRTHANDLER(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange); … … 203 206 * @param enmAccessType The access type. 204 207 * @param pvUser User argument. 208 * @todo Add pVCpu, possibly replacing pVM. 205 209 */ 206 210 typedef DECLCALLBACK(int) FNPGMR3VIRTHANDLER(PVM pVM, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
Note:
See TracChangeset
for help on using the changeset viewer.