Changeset 66507 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Apr 11, 2017 10:15:57 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114507

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Rename VBoxVideoCmnPort* macros to VBVO_PORT_* to fit in with our naming conventions and improve aesthetics.

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• HGSMIBase.cpp (modified) (4 diffs)
• Modesetting.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -25 +25 @@
 static void HGSMINotifyHostCmdComplete(PHGSMIHOSTCOMMANDCONTEXT pCtx, HGSMIOFFSET offt)
 {
-    VBoxVideoCmnPortWriteUlong(pCtx->port, offt);
+    VBVO_PORT_WRITE_U32(pCtx->port, offt);
 }
 
@@ -67 +67 @@
 static HGSMIOFFSET hgsmiGetHostBuffer(PHGSMIHOSTCOMMANDCONTEXT pCtx)
 {
-    return VBoxVideoCmnPortReadUlong(pCtx->port);
+    return VBVO_PORT_READ_U32(pCtx->port);
 }
 
@@ -98 +98 @@
     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 +163 @@
     {
         /* 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();

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -52 +52 @@
 {
     /** @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 +65 @@
 {
     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 +131 @@
 {
     /* 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 +175 @@
     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 +213 @@
 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);
 }