Changeset 55904 in vbox
- Timestamp:
- May 18, 2015 12:07:40 PM (10 years ago)
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
r55840 r55904 158 158 } VMSVGASTATE, *PVMSVGASTATE; 159 159 160 161 /******************************************************************************* 162 * Internal Functions * 163 *******************************************************************************/ 164 #ifdef IN_RING3 165 # ifdef DEBUG_FIFO_ACCESS 166 static FNPGMR3PHYSHANDLER vmsvgaR3FIFOAccessHandler; 167 # endif 168 # ifdef DEBUG_GMR_ACCESS 169 static FNPGMR3PHYSHANDLER vmsvgaR3GMRAccessHandler; 170 # endif 171 #endif 172 173 174 /******************************************************************************* 175 * Global Variables * 176 *******************************************************************************/ 160 177 #ifdef IN_RING3 161 178 … … 1858 1875 * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. 1859 1876 * @param pVM VM Handle. 1877 * @param pVCpu The cross context CPU structure for the calling EMT. 1860 1878 * @param GCPhys The physical address the guest is writing to. 1861 1879 * @param pvPhys The HC mapping of that address. … … 1863 1881 * @param cbBuf How much it's reading/writing. 1864 1882 * @param enmAccessType The access type. 1883 * @param enmOrigin Who is making the access. 1865 1884 * @param pvUser User argument. 1866 1885 */ 1867 static DECLCALLBACK(int) vmsvgaR3FIFOAccessHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser) 1886 static DECLCALLBACK(int) vmsvgaR3FIFOAccessHandler(PVM pVM, PVMCPU pVCpu RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, 1887 PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) 1868 1888 { 1869 1889 PVGASTATE pThis = (PVGASTATE)pvUser; … … 1871 1891 Assert(pThis); 1872 1892 Assert(GCPhys >= pThis->GCPhysVRAM); 1873 NOREF(p vPhys); NOREF(pvBuf); NOREF(cbBuf);1893 NOREF(pVCpu); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmOrigin); 1874 1894 1875 1895 rc = vmsvgaFIFOAccess(pVM, pThis, GCPhys, enmAccessType == PGMACCESSTYPE_WRITE); … … 1890 1910 * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. 1891 1911 * @param pVM VM Handle. 1912 * @param pVCpu The cross context CPU structure for the calling EMT. 1892 1913 * @param GCPhys The physical address the guest is writing to. 1893 1914 * @param pvPhys The HC mapping of that address. … … 1895 1916 * @param cbBuf How much it's reading/writing. 1896 1917 * @param enmAccessType The access type. 1918 * @param enmOrigin Who is making the access. 1897 1919 * @param pvUser User argument. 1898 1920 */ 1899 static DECLCALLBACK(int) vmsvgaR3GMRAccessHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser) 1921 static DECLCALLBACK(int) vmsvgaR3GMRAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, 1922 PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) 1900 1923 { 1901 1924 PVGASTATE pThis = (PVGASTATE)pvUser; 1902 1925 Assert(pThis); 1903 1926 PVMSVGASTATE pSVGAState = (PVMSVGASTATE)pThis->svga.pSVGAState; 1904 NOREF(p vPhys); NOREF(pvBuf); NOREF(cbBuf);1927 NOREF(pVCpu); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmOrigin); 1905 1928 1906 1929 Log(("vmsvgaR3GMRAccessHandler: GMR access to page %RGp\n", GCPhys)); -
trunk/src/VBox/Devices/Graphics/DevVGA.cpp
r55896 r55904 262 262 #define LOGO_MAX_HEIGHT 480 263 263 #define LOGO_MAX_SIZE LOGO_MAX_WIDTH * LOGO_MAX_HEIGHT * 4 264 265 /******************************************************************************* 266 * Internal Functions * 267 *******************************************************************************/ 268 #ifndef IN_RING3 269 RT_C_DECLS_BEGIN 270 DECLEXPORT(FNPGMRZPHYSPFHANDLER) vgaLbfAccessPfHandler; 271 RT_C_DECLS_END 272 #endif 273 #ifdef IN_RING3 274 static FNPGMR3PHYSHANDLER vgaR3LFBAccessHandler; 275 #endif 264 276 265 277 … … 3525 3537 3526 3538 #ifndef IN_RING3 3527 RT_C_DECLS_BEGIN3528 DECLEXPORT(CTX_MID(FNPGM,PHYSPFHANDLER)) vgaLbfAccessPfHandler;3529 RT_C_DECLS_END3530 3531 3539 /** 3532 3540 * @callback_method_impl{FNPGMRCPHYSHANDLER, \#PF Handler for VBE LFB access.} 3533 3541 */ 3534 PDMBOTHCBDECL(int) vgaLbfAccessPfHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault,3542 PDMBOTHCBDECL(int) vgaLbfAccessPfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, 3535 3543 RTGCPHYS GCPhysFault, void *pvUser) 3536 3544 { … … 3549 3557 * @callback_method_impl{FNPGMR3PHYSHANDLER, HC access handler for the LFB.} 3550 3558 */ 3551 static DECLCALLBACK(int) vgaR3LFBAccessHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser) 3559 static DECLCALLBACK(int) vgaR3LFBAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, 3560 PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) 3552 3561 { 3553 3562 PVGASTATE pThis = (PVGASTATE)pvUser; … … 3555 3564 Assert(pThis); 3556 3565 Assert(GCPhys >= pThis->GCPhysVRAM); 3557 NOREF(p vPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmAccessType);3566 NOREF(pVCpu); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmAccessType); NOREF(enmOrigin); 3558 3567 3559 3568 rc = vgaLFBAccess(pVM, pThis, GCPhys, 0); -
trunk/src/VBox/Devices/Network/DevPCNet.cpp
r55896 r55904 1099 1099 * @return VBox status code (appropriate for trap handling and GC return). 1100 1100 * @param pVM VM Handle. 1101 * @param pVCpu The cross context CPU structure for the calling EMT. 1101 1102 * @param uErrorCode CPU Error code. 1102 1103 * @param pRegFrame Trap register frame. … … 1105 1106 * @param pvUser User argument. 1106 1107 */ 1107 DECLEXPORT(int) pcnetHandleRingWritePf(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,1108 DECLEXPORT(int) pcnetHandleRingWritePf(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, 1108 1109 RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser) 1109 1110 { 1110 PPCNETSTATE pThis 1111 PPCNETSTATE pThis = (PPCNETSTATE)pvUser; 1111 1112 1112 1113 Log(("#%d pcnetHandleRingWritePf: write to %#010x\n", PCNET_INST_NR, GCPhysFault)); … … 1149 1150 # else /* IN_RING3 */ 1150 1151 1152 static FNPGMR3PHYSHANDLER pcnetR3HandleRingWrite; 1153 1151 1154 /** 1152 1155 * #PF Handler callback for physical access handler ranges (MMIO among others) in HC. … … 1158 1161 * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. 1159 1162 * @param pVM VM Handle. 1163 * @param pVCpu The cross context CPU structure for the calling EMT. 1160 1164 * @param GCPhys The physical address the guest is writing to. 1161 1165 * @param pvPhys The HC mapping of that address. … … 1163 1167 * @param cbBuf How much it's reading/writing. 1164 1168 * @param enmAccessType The access type. 1169 * @param enmOrigin Who is making the access. 1165 1170 * @param pvUser User argument. 1166 1171 */ 1167 static DECLCALLBACK(int) pcnetR3HandleRingWrite(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf,1168 size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser)1172 static DECLCALLBACK(int) pcnetR3HandleRingWrite(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, 1173 PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) 1169 1174 { 1170 1175 PPDMDEVINS pDevIns = (PPDMDEVINS)pvUser;
Note:
See TracChangeset
for help on using the changeset viewer.