Index: /trunk/include/VBox/Graphics/VBoxVideoGuest.h =================================================================== --- /trunk/include/VBox/Graphics/VBoxVideoGuest.h (revision 66506) +++ /trunk/include/VBox/Graphics/VBoxVideoGuest.h (revision 66507) @@ -114,5 +114,5 @@ DECLINLINE(void) VBoxHGSMIClearIrq(PHGSMIHOSTCOMMANDCONTEXT pCtx) { - VBoxVideoCmnPortWriteUlong(pCtx->port, HGSMIOFFSET_VOID); + VBVO_PORT_WRITE_U32(pCtx->port, HGSMIOFFSET_VOID); } Index: /trunk/include/VBox/Graphics/VBoxVideoIPRT.h =================================================================== --- /trunk/include/VBox/Graphics/VBoxVideoIPRT.h (revision 66506) +++ /trunk/include/VBox/Graphics/VBoxVideoIPRT.h (revision 66507) @@ -47,20 +47,20 @@ /** Write an 8-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUchar(Port, Value) \ +# define VBVO_PORT_WRITE_U8(Port, Value) \ VideoPortWritePortUchar((PUCHAR)Port, Value) /** Write a 16-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUshort(Port, Value) \ +# define VBVO_PORT_WRITE_U16(Port, Value) \ VideoPortWritePortUshort((PUSHORT)Port, Value) /** Write a 32-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUlong(Port, Value) \ +# define VBVO_PORT_WRITE_U32(Port, Value) \ VideoPortWritePortUlong((PULONG)Port, Value) /** Read an 8-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUchar(Port) \ +# define VBVO_PORT_READ_U8(Port) \ VideoPortReadPortUchar((PUCHAR)Port) /** Read a 16-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUshort(Port) \ +# define VBVO_PORT_READ_U16(Port) \ VideoPortReadPortUshort((PUSHORT)Port) /** Read a 32-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUlong(Port) \ +# define VBVO_PORT_READ_U32(Port) \ VideoPortReadPortUlong((PULONG)Port) @@ -68,20 +68,20 @@ /** Write an 8-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUchar(Port, Value) \ +# define VBVO_PORT_WRITE_U8(Port, Value) \ outb(Port, Value) /** Write a 16-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUshort(Port, Value) \ +# define VBVO_PORT_WRITE_U16(Port, Value) \ outw(Port, Value) /** Write a 32-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUlong(Port, Value) \ +# define VBVO_PORT_WRITE_U32(Port, Value) \ outl(Port, Value) /** Read an 8-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUchar(Port) \ +# define VBVO_PORT_READ_U8(Port) \ inb(Port) /** Read a 16-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUshort(Port) \ +# define VBVO_PORT_READ_U16(Port) \ inw(Port) /** Read a 32-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUlong(Port) \ +# define VBVO_PORT_READ_U32(Port) \ inl(Port) @@ -89,20 +89,20 @@ /** Write an 8-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUchar(Port, Value) \ +# define VBVO_PORT_WRITE_U8(Port, Value) \ ASMOutU8(Port, Value) /** Write a 16-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUshort(Port, Value) \ +# define VBVO_PORT_WRITE_U16(Port, Value) \ ASMOutU16(Port, Value) /** Write a 32-bit value to an I/O port. */ -# define VBoxVideoCmnPortWriteUlong(Port, Value) \ +# define VBVO_PORT_WRITE_U32(Port, Value) \ ASMOutU32(Port, Value) /** Read an 8-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUchar(Port) \ +# define VBVO_PORT_READ_U8(Port) \ ASMInU8(Port) /** Read a 16-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUshort(Port) \ +# define VBVO_PORT_READ_U16(Port) \ ASMInU16(Port) /** Read a 32-bit value from an I/O port. */ -# define VBoxVideoCmnPortReadUlong(Port) \ +# define VBVO_PORT_READ_U32(Port) \ ASMInU32(Port) #endif Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (revision 66506) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (revision 66507) @@ -1825,5 +1825,5 @@ if (offCmd != HGSMIOFFSET_VOID) { - VBoxVideoCmnPortWriteUlong(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port, offCmd); + VBVO_PORT_WRITE_U32(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port, offCmd); /* Make the compiler aware that the host has changed memory. */ ASMCompilerBarrier(); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp (revision 66506) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVbva.cpp (revision 66507) @@ -116,5 +116,5 @@ static int vboxCmdVbvaSubmitHgsmi(PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx, HGSMIOFFSET offDr) { - VBoxVideoCmnPortWriteUlong(pHGSMICtx->port, offDr); + VBVO_PORT_WRITE_U32(pHGSMICtx->port, offDr); /* Make the compiler aware that the host has changed memory. */ ASMCompilerBarrier(); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp (revision 66506) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp (revision 66507) @@ -1517,5 +1517,5 @@ { RT_NOREF(pInfo); - VBoxVideoCmnPortWriteUlong(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port, offDr); + VBVO_PORT_WRITE_U32(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port, offDr); /* Make the compiler aware that the host has changed memory. */ ASMCompilerBarrier(); Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (revision 66506) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (revision 66507) @@ -739,7 +739,7 @@ pHwResources->cbVRAM = VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES; - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID2); - DispiId = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID2); + DispiId = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); if (DispiId == VBE_DISPI_ID2) { @@ -754,5 +754,5 @@ * an ULONG from the data port without setting an index before. */ - pHwResources->cbVRAM = VBoxVideoCmnPortReadUlong(VBE_DISPI_IOPORT_DATA); + pHwResources->cbVRAM = VBVO_PORT_READ_U32(VBE_DISPI_IOPORT_DATA); if (VBoxHGSMIIsSupported ()) { @@ -1538,5 +1538,5 @@ { /* read the command offset */ - HGSMIOFFSET offCmd = VBoxVideoCmnPortReadUlong(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port); + HGSMIOFFSET offCmd = VBVO_PORT_READ_U32(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port); if (offCmd == HGSMIOFFSET_VOID) { @@ -1674,5 +1674,5 @@ { /* read the command offset */ - HGSMIOFFSET offCmd = VBoxVideoCmnPortReadUlong(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port); + HGSMIOFFSET offCmd = VBVO_PORT_READ_U32(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port); Assert(offCmd != HGSMIOFFSET_VOID); if (offCmd != HGSMIOFFSET_VOID) Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp (revision 66506) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp (revision 66507) @@ -292,8 +292,8 @@ for (entry=pClut->FirstEntry; entryFirstEntry+pClut->NumEntries; ++entry) { - VBoxVideoCmnPortWriteUchar(VBE_DISPI_IOPORT_DAC_WRITE_INDEX, (UCHAR)entry); - VBoxVideoCmnPortWriteUchar(VBE_DISPI_IOPORT_DAC_DATA, pClut->LookupTable[entry].RgbArray.Red); - VBoxVideoCmnPortWriteUchar(VBE_DISPI_IOPORT_DAC_DATA, pClut->LookupTable[entry].RgbArray.Green); - VBoxVideoCmnPortWriteUchar(VBE_DISPI_IOPORT_DAC_DATA, pClut->LookupTable[entry].RgbArray.Blue); + VBVO_PORT_WRITE_U8(VBE_DISPI_IOPORT_DAC_WRITE_INDEX, (UCHAR)entry); + VBVO_PORT_WRITE_U8(VBE_DISPI_IOPORT_DAC_DATA, pClut->LookupTable[entry].RgbArray.Red); + VBVO_PORT_WRITE_U8(VBE_DISPI_IOPORT_DAC_DATA, pClut->LookupTable[entry].RgbArray.Green); + VBVO_PORT_WRITE_U8(VBE_DISPI_IOPORT_DAC_DATA, pClut->LookupTable[entry].RgbArray.Blue); } Index: /trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp (revision 66506) +++ /trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp (revision 66507) @@ -25,5 +25,5 @@ static void HGSMINotifyHostCmdComplete(PHGSMIHOSTCOMMANDCONTEXT pCtx, HGSMIOFFSET offt) { - VBoxVideoCmnPortWriteUlong(pCtx->port, offt); + VBVO_PORT_WRITE_U32(pCtx->port, offt); } @@ -67,5 +67,5 @@ static HGSMIOFFSET hgsmiGetHostBuffer(PHGSMIHOSTCOMMANDCONTEXT pCtx) { - return VBoxVideoCmnPortReadUlong(pCtx->port); + return VBVO_PORT_READ_U32(pCtx->port); } @@ -98,8 +98,8 @@ uint16_t DispiId; - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID_HGSMI); - - DispiId = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID_HGSMI); + + DispiId = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); return (DispiId == VBE_DISPI_ID_HGSMI); @@ -163,5 +163,5 @@ { /* Submit the buffer to the host. */ - VBoxVideoCmnPortWriteUlong(pCtx->port, offBuffer); + VBVO_PORT_WRITE_U32(pCtx->port, offBuffer); /* Make the compiler aware that the host has changed memory. */ ASMCompilerBarrier(); Index: /trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp (revision 66506) +++ /trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp (revision 66507) @@ -52,5 +52,5 @@ { /** @note A 32bit read on this port returns the VRAM size. */ - return VBoxVideoCmnPortReadUlong(VBE_DISPI_IOPORT_DATA); + return VBVO_PORT_READ_U32(VBE_DISPI_IOPORT_DATA); } @@ -65,7 +65,7 @@ { unsigned DispiId; - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID_ANYX); - DispiId = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ID_ANYX); + DispiId = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); return (DispiId == VBE_DISPI_ID_ANYX); } @@ -131,25 +131,25 @@ { /* set the mode characteristics */ - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, cWidth); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, cHeight); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, cWidth); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, cHeight); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIRT_WIDTH); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, cVirtWidth); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_BPP); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, cBPP); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, cVirtWidth); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_BPP); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, cBPP); /* enable the mode */ - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, fFlags | VBE_DISPI_ENABLED); /* Panning registers */ - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_X_OFFSET); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, cx); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, cx); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_Y_OFFSET); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, cy); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, cy); /** @todo read from the port to see if the mode switch was successful */ } @@ -175,30 +175,30 @@ uint16_t fFlags; - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE); - fFlags = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + fFlags = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); if (pcWidth) { - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES); - *pcWidth = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + *pcWidth = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); } if (pcHeight) { - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES); - *pcHeight = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + *pcHeight = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); } if (pcVirtWidth) { - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIRT_WIDTH); - *pcVirtWidth = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + *pcVirtWidth = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); } if (pcBPP) { - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_BPP); - *pcBPP = VBoxVideoCmnPortReadUshort(VBE_DISPI_IOPORT_DATA); + *pcBPP = VBVO_PORT_READ_U16(VBE_DISPI_IOPORT_DATA); } if (pfFlags) @@ -213,7 +213,7 @@ DECLHIDDEN(void) VBoxVideoDisableVBE(void) { - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE); - VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, 0); + VBVO_PORT_WRITE_U16(VBE_DISPI_IOPORT_DATA, 0); } Index: /trunk/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h =================================================================== --- /trunk/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h (revision 66506) +++ /trunk/src/VBox/Additions/linux/drm/VBoxVideoIPRT.h (revision 66507) @@ -83,20 +83,20 @@ * @{ */ /** Write an 8-bit value to an I/O port. */ -#define VBoxVideoCmnPortWriteUchar(Port, Value) \ +#define VBVO_PORT_WRITE_U8(Port, Value) \ outb(Value, Port) /** Write a 16-bit value to an I/O port. */ -#define VBoxVideoCmnPortWriteUshort(Port, Value) \ +#define VBVO_PORT_WRITE_U16(Port, Value) \ outw(Value, Port) /** Write a 32-bit value to an I/O port. */ -#define VBoxVideoCmnPortWriteUlong(Port, Value) \ +#define VBVO_PORT_WRITE_U32(Port, Value) \ outl(Value, Port) /** Read an 8-bit value from an I/O port. */ -#define VBoxVideoCmnPortReadUchar(Port) \ +#define VBVO_PORT_READ_U8(Port) \ inb(Port) /** Read a 16-bit value from an I/O port. */ -#define VBoxVideoCmnPortReadUshort(Port) \ +#define VBVO_PORT_READ_U16(Port) \ inw(Port) /** Read a 32-bit value from an I/O port. */ -#define VBoxVideoCmnPortReadUlong(Port) \ +#define VBVO_PORT_READ_U32(Port) \ inl(Port)