- Timestamp:
- Apr 11, 2017 9:59:29 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 11 edited
-
include/VBox/Graphics/HGSMI.h (modified) (1 diff)
-
include/VBox/Graphics/HGSMIDefs.h (modified) (1 diff)
-
include/VBox/Graphics/HGSMIMemAlloc.h (modified) (1 diff)
-
include/VBox/Graphics/VBoxVideo.h (modified) (1 diff)
-
include/VBox/Graphics/VBoxVideoGuest.h (modified) (3 diffs)
-
include/VBox/Graphics/VBoxVideoIPRT.h (added)
-
src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp (modified) (10 diffs)
-
src/VBox/Additions/common/VBoxVideo/Modesetting.cpp (modified) (2 diffs)
-
src/VBox/Additions/common/VBoxVideo/VBVABase.cpp (modified) (7 diffs)
-
src/VBox/Additions/linux/drm/VBoxVideoIPRT.h (added)
-
src/VBox/Additions/linux/drm/files_vboxvideo_drv (modified) (2 diffs)
-
src/VBox/GuestHost/HGSMI/HGSMICommon.cpp (modified) (1 diff)
-
src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/Graphics/HGSMI.h
r65381 r66506 30 30 #define ___VBox_Graphics_HGSMI_h 31 31 32 #include <iprt/assert.h> 33 #include <iprt/types.h> 32 #include <VBoxVideoIPRT.h> 34 33 35 34 #include <HGSMIDefs.h> -
trunk/include/VBox/Graphics/HGSMIDefs.h
r65381 r66506 30 30 #define ___VBox_Graphics_HGSMIDefs_h 31 31 32 #include <iprt/assert.h> 33 #include <iprt/types.h> 32 #include <VBoxVideoIPRT.h> 34 33 35 34 /* HGSMI uses 32 bit offsets and sizes. */ -
trunk/include/VBox/Graphics/HGSMIMemAlloc.h
r65381 r66506 31 31 32 32 #include <HGSMIDefs.h> 33 #include < iprt/list.h>33 #include <VBoxVideoIPRT.h> 34 34 35 35 -
trunk/include/VBox/Graphics/VBoxVideo.h
r65381 r66506 27 27 #define ___VBox_Graphics_VBoxVideo_h 28 28 29 #include <iprt/cdefs.h> 30 #include <iprt/types.h> 31 #include <iprt/assert.h> 29 #include <VBoxVideoIPRT.h> 32 30 33 31 /* this should be in sync with monitorCount <xsd:maxInclusive value="64"/> in src/VBox/Main/xml/VirtualBox-settings-common.xsd */ -
trunk/include/VBox/Graphics/VBoxVideoGuest.h
r65381 r66506 32 32 #include <HGSMIChSetup.h> 33 33 #include <VBoxVideo.h> 34 35 #include <iprt/err.h> /* The functions in here return IPRT errors. */ 36 37 #ifdef VBOX_XPDM_MINIPORT 38 # include <iprt/nt/miniport.h> 39 # include <ntddvdeo.h> /* sdk, clean */ 40 # include <iprt/nt/Video.h> 41 #elif defined VBOX_GUESTR3XORGMOD 42 # include <compiler.h> 43 #else 44 # include <iprt/asm-amd64-x86.h> 45 #endif 34 #include <VBoxVideoIPRT.h> 46 35 47 36 #ifdef VBOX_WDDM_MINIPORT … … 52 41 typedef HGSMIHEAP HGSMIGUESTCMDHEAP; 53 42 # define HGSMIGUESTCMDHEAP_GET(_p) (_p) 54 #endif55 56 #if defined(IN_RING0) && defined(RT_OS_LINUX)57 # define VBVOAssert(a) do {} while(0)58 # define VBVOAssertPtr(a) do {} while(0)59 # define VBVOAssertReturnVoid(a) if (!(a)) return60 # define VBVOAssertRC(a) do {} while(0)61 # define VBVOAssertPtrNullReturnVoid(a) do {} while(0)62 # define VBVOAssertPtrReturnVoid(a) if (!(a)) return63 #else64 # define VBVOAssert Assert65 # define VBVOAssertPtr AssertPtr66 # define VBVOAssertReturnVoid AssertReturnVoid67 # define VBVOAssertRC AssertRC68 # define VBVOAssertPtrNullReturnVoid AssertPtrNullReturnVoid69 # define VBVOAssertPtrReturnVoid AssertPtrReturnVoid70 43 #endif 71 44 … … 134 107 struct VBVABUFFER *pVBVA; 135 108 } VBVABUFFERCONTEXT, *PVBVABUFFERCONTEXT; 136 137 /** @name Helper functions138 * @{ */139 /** Write an 8-bit value to an I/O port. */140 DECLINLINE(void) VBoxVideoCmnPortWriteUchar(RTIOPORT Port, uint8_t Value)141 {142 #ifdef VBOX_XPDM_MINIPORT143 VideoPortWritePortUchar((PUCHAR)Port, Value);144 #elif defined VBOX_GUESTR3XORGMOD145 outb(Port, Value);146 #else /** @todo make these explicit */147 ASMOutU8(Port, Value);148 #endif149 }150 151 /** Write a 16-bit value to an I/O port. */152 DECLINLINE(void) VBoxVideoCmnPortWriteUshort(RTIOPORT Port, uint16_t Value)153 {154 #ifdef VBOX_XPDM_MINIPORT155 VideoPortWritePortUshort((PUSHORT)Port,Value);156 #elif defined VBOX_GUESTR3XORGMOD157 outw(Port, Value);158 #else159 ASMOutU16(Port, Value);160 #endif161 }162 163 /** Write a 32-bit value to an I/O port. */164 DECLINLINE(void) VBoxVideoCmnPortWriteUlong(RTIOPORT Port, uint32_t Value)165 {166 #ifdef VBOX_XPDM_MINIPORT167 VideoPortWritePortUlong((PULONG)Port,Value);168 #elif defined VBOX_GUESTR3XORGMOD169 outl(Port, Value);170 #else171 ASMOutU32(Port, Value);172 #endif173 }174 175 /** Read an 8-bit value from an I/O port. */176 DECLINLINE(uint8_t) VBoxVideoCmnPortReadUchar(RTIOPORT Port)177 {178 #ifdef VBOX_XPDM_MINIPORT179 return VideoPortReadPortUchar((PUCHAR)Port);180 #elif defined VBOX_GUESTR3XORGMOD181 return inb(Port);182 #else183 return ASMInU8(Port);184 #endif185 }186 187 /** Read a 16-bit value from an I/O port. */188 DECLINLINE(uint16_t) VBoxVideoCmnPortReadUshort(RTIOPORT Port)189 {190 #ifdef VBOX_XPDM_MINIPORT191 return VideoPortReadPortUshort((PUSHORT)Port);192 #elif defined VBOX_GUESTR3XORGMOD193 return inw(Port);194 #else195 return ASMInU16(Port);196 #endif197 }198 199 /** Read a 32-bit value from an I/O port. */200 DECLINLINE(uint32_t) VBoxVideoCmnPortReadUlong(RTIOPORT Port)201 {202 #ifdef VBOX_XPDM_MINIPORT203 return VideoPortReadPortUlong((PULONG)Port);204 #elif defined VBOX_GUESTR3XORGMOD205 return inl(Port);206 #else207 return ASMInU32(Port);208 #endif209 }210 211 /** @} */212 109 213 110 /** @name Base HGSMI APIs -
trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp
r65381 r66506 19 19 #include <VBoxVideoGuest.h> 20 20 #include <VBoxVideoVBE.h> 21 22 #include <iprt/asm.h> 23 #include <iprt/string.h> 21 #include <VBoxVideoIPRT.h> 24 22 25 23 /** Send completion notification to the host for the command located at offset … … 43 41 HGSMIBUFFERHEADER *pHdr = HGSMIBufferHeaderFromData(pvMem); 44 42 HGSMIOFFSET offMem = HGSMIPointerToOffset(&pCtx->areaCtx, pHdr); 45 VBVOAssert(offMem != HGSMIOFFSET_VOID);43 Assert(offMem != HGSMIOFFSET_VOID); 46 44 if(offMem != HGSMIOFFSET_VOID) 47 45 { … … 56 54 { 57 55 int rc = HGSMIBufferProcess(&pCtx->areaCtx, &pCtx->channels, offBuffer); 58 VBVOAssert(!RT_FAILURE(rc));56 Assert(!RT_FAILURE(rc)); 59 57 if(RT_FAILURE(rc)) 60 58 { … … 77 75 { 78 76 HGSMIOFFSET offset = hgsmiGetHostBuffer(pCtx); 79 VBVOAssertReturnVoid(offset != HGSMIOFFSET_VOID);77 AssertReturnVoid(offset != HGSMIOFFSET_VOID); 80 78 hgsmiHostCmdProcess(pCtx, offset); 81 79 } … … 161 159 HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (HGSMIGUESTCMDHEAP_GET(&pCtx->heapCtx), pvBuffer); 162 160 163 VBVOAssert(offBuffer != HGSMIOFFSET_VOID);161 Assert(offBuffer != HGSMIOFFSET_VOID); 164 162 if (offBuffer != HGSMIOFFSET_VOID) 165 163 { … … 241 239 if (RT_SUCCESS(rc)) 242 240 { 243 VBVOAssertRC(pCaps->rc);241 AssertRC(pCaps->rc); 244 242 rc = pCaps->rc; 245 243 } … … 317 315 uint32_t *poffHostFlags) 318 316 { 319 VBVOAssertPtrNullReturnVoid(poffVRAMBaseMapping);320 VBVOAssertPtrNullReturnVoid(pcbMapping);321 VBVOAssertPtrNullReturnVoid(poffGuestHeapMemory);322 VBVOAssertPtrNullReturnVoid(pcbGuestHeapMemory);323 VBVOAssertPtrNullReturnVoid(poffHostFlags);317 AssertPtrNullReturnVoid(poffVRAMBaseMapping); 318 AssertPtrNullReturnVoid(pcbMapping); 319 AssertPtrNullReturnVoid(poffGuestHeapMemory); 320 AssertPtrNullReturnVoid(pcbGuestHeapMemory); 321 AssertPtrNullReturnVoid(poffHostFlags); 324 322 if (poffVRAMBaseMapping) 325 323 *poffVRAMBaseMapping = cbVRAM - VBVA_ADAPTER_INFORMATION_SIZE; … … 386 384 uint32_t offVRAMHostArea = offVRAMBaseMapping, cbHostArea = 0; 387 385 388 VBVOAssertPtrReturnVoid(poffVRAMHostArea);389 VBVOAssertPtrReturnVoid(pcbHostArea);386 AssertPtrReturnVoid(poffVRAMHostArea); 387 AssertPtrReturnVoid(pcbHostArea); 390 388 VBoxQueryConfHGSMI(pCtx, VBOX_VBVA_CONF32_HOST_HEAP_SIZE, &cbHostArea); 391 389 if (cbHostArea != 0) … … 464 462 * host heap is ready */ 465 463 int rc = vboxHGSMIReportFlagsLocation(pCtx, offVRAMFlagsLocation); 466 VBVOAssertRC(rc);464 AssertRC(rc); 467 465 if (RT_SUCCESS(rc) && fCaps) 468 466 { 469 467 /* Inform about caps */ 470 468 rc = vboxHGSMISendCapsInfo(pCtx, fCaps); 471 VBVOAssertRC(rc);469 AssertRC(rc); 472 470 } 473 471 if (RT_SUCCESS (rc)) … … 475 473 /* Report the host heap location. */ 476 474 rc = vboxHGSMIReportHostArea(pCtx, offVRAMHostArea, cbHostArea); 477 VBVOAssertRC(rc);475 AssertRC(rc); 478 476 } 479 477 // Log(("VBoxVideo::vboxSetupAdapterInfo finished rc = %d\n", rc)); -
trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
r65381 r66506 21 21 22 22 #ifndef VBOX_GUESTR3XF86MOD 23 # include < iprt/string.h>23 # include <VBoxVideoIPRT.h> 24 24 #endif 25 25 … … 331 331 { 332 332 int rc; 333 VBVOAssertPtr(paHints);333 AssertPtr(paHints); 334 334 if (!VALID_PTR(paHints)) 335 335 return VERR_INVALID_POINTER; -
trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp
r65381 r66506 18 18 19 19 #include <VBoxVideoGuest.h> 20 #include <VBox/err.h> 21 // #include <VBox/log.h> 22 #include <iprt/string.h> 20 #include <VBoxVideoIPRT.h> 23 21 24 22 /* … … 162 160 uint32_t indexRecordNext; 163 161 164 VBVOAssert(!pCtx->fHwBufferOverflow);165 VBVOAssert(pCtx->pRecord == NULL);162 Assert(!pCtx->fHwBufferOverflow); 163 Assert(pCtx->pRecord == NULL); 166 164 167 165 indexRecordNext = (pCtx->pVBVA->indexRecordFree + 1) % VBVA_MAX_RECORDS; … … 206 204 // LogFunc(("\n")); 207 205 208 VBVOAssert(pCtx->pVBVA);206 Assert(pCtx->pVBVA); 209 207 210 208 pRecord = pCtx->pRecord; 211 VBVOAssert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));209 Assert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL)); 212 210 213 211 /* Mark the record completed. */ … … 288 286 289 287 VBVABUFFER *pVBVA = pCtx->pVBVA; 290 VBVOAssert(pVBVA);288 Assert(pVBVA); 291 289 292 290 if (!pVBVA || pCtx->fHwBufferOverflow) … … 295 293 } 296 294 297 VBVOAssert(pVBVA->indexRecordFirst != pVBVA->indexRecordFree);295 Assert(pVBVA->indexRecordFirst != pVBVA->indexRecordFree); 298 296 299 297 pRecord = pCtx->pRecord; 300 VBVOAssert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL));298 Assert(pRecord && (pRecord->cbRecord & VBVA_F_RECORD_PARTIAL)); 301 299 302 300 // LogFunc(("%d\n", cb)); … … 328 326 // LogFunc(("Buffer overflow!!!\n")); 329 327 pCtx->fHwBufferOverflow = true; 330 VBVOAssert(false);328 Assert(false); 331 329 return false; 332 330 } … … 336 334 } 337 335 338 VBVOAssert(cbChunk <= cb);339 VBVOAssert(cbChunk <= vboxHwBufferAvail (pVBVA));336 Assert(cbChunk <= cb); 337 Assert(cbChunk <= vboxHwBufferAvail (pVBVA)); 340 338 341 339 vboxHwBufferPlaceDataAt (pCtx, (uint8_t *)p + cbWritten, cbChunk, pVBVA->off32Free); -
trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv
r66189 r66506 21 21 ${PATH_OUT}/revision-generated.h=>revision-generated.h \ 22 22 ${PATH_OUT}/product-generated.h=>product-generated.h \ 23 ${PATH_ROOT}/include/iprt/asm.h=>include/iprt/asm.h \24 ${PATH_ROOT}/include/iprt/asm-amd64-x86.h=>include/iprt/asm-amd64-x86.h \25 ${PATH_ROOT}/include/iprt/assert.h=>include/iprt/assert.h \26 23 ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \ 27 ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \28 ${PATH_ROOT}/include/iprt/latin1.h=>include/iprt/latin1.h \29 24 ${PATH_ROOT}/include/iprt/list.h=>include/iprt/list.h \ 30 25 ${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \ 31 26 ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \ 32 ${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \33 27 ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \ 34 ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \35 ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \36 ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \37 ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \38 28 ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \ 39 29 ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \ … … 47 37 ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \ 48 38 ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp=>VBVABase.c \ 39 ${PATH_ROOT}/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h=>include/VBoxVideoIPRT.h \ 49 40 ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.c=>vbox_drv.c \ 50 41 ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.h=>vbox_drv.h \ -
trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp
r65381 r66506 23 23 #define LOG_GROUP LOG_GROUP_HGSMI 24 24 25 #include < iprt/string.h>25 #include <VBoxVideoIPRT.h> 26 26 27 27 #include <HGSMI.h> -
trunk/src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp
r65381 r66506 56 56 #include <HGSMI.h> 57 57 58 #include <iprt/err.h> 59 #include <iprt/string.h> 58 #include <VBoxVideoIPRT.h> 60 59 61 60 /*
Note:
See TracChangeset
for help on using the changeset viewer.

