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

Timestamp:

May 30, 2017 3:11:29 PM (8 years ago)

Author:

vboxsync

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

115821

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Rename HGSMIBufferAlloc.cpp to HGSMIBuffers.cpp and move VBoxHGSMIBufferSubmit() there.

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• HGSMIBase.cpp (modified) (1 diff)
• HGSMIBuffers.cpp (moved) (moved from trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBufferAlloc.cpp ) (1 diff)

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

@@ -29 +29 @@
 #include <VBoxVideoVBE.h>
 #include <VBoxVideoIPRT.h>
-
-/**
- * Submit a command descriptor allocated by @a VBoxHGSMIBufferAlloc.
- *
- * @param  pCtx      the context containing the heap used
- * @param  pvBuffer  the pointer returned by @a VBoxHGSMIBufferAlloc
- */
-DECLHIDDEN(int) VBoxHGSMIBufferSubmit(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                                      void *pvBuffer)
-{
-    /* Initialize the buffer and get the offset for port IO. */
-    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (HGSMIGUESTCMDHEAP_GET(&pCtx->heapCtx), pvBuffer);
-
-    Assert(offBuffer != HGSMIOFFSET_VOID);
-    if (offBuffer != HGSMIOFFSET_VOID)
-    {
-        /* Submit the buffer to the host. */
-        VBVO_PORT_WRITE_U32(pCtx->port, offBuffer);
-        /* Make the compiler aware that the host has changed memory. */
-        ASMCompilerBarrier();
-        return VINF_SUCCESS;
-    }
-
-    return VERR_INVALID_PARAMETER;
-}
-
 
 /** Detect whether HGSMI is supported by the host. */

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

@@ -97 +97 @@
 #endif
 }
+
+/**
+ * Submit a command descriptor allocated by @a VBoxHGSMIBufferAlloc.
+ *
+ * @param  pCtx      the context containing the heap used
+ * @param  pvBuffer  the pointer returned by @a VBoxHGSMIBufferAlloc
+ */
+DECLHIDDEN(int) VBoxHGSMIBufferSubmit(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                      void *pvBuffer)
+{
+    /* Initialize the buffer and get the offset for port IO. */
+    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (HGSMIGUESTCMDHEAP_GET(&pCtx->heapCtx), pvBuffer);
+
+    Assert(offBuffer != HGSMIOFFSET_VOID);
+    if (offBuffer != HGSMIOFFSET_VOID)
+    {
+        /* Submit the buffer to the host. */
+        VBVO_PORT_WRITE_U32(pCtx->port, offBuffer);
+        /* Make the compiler aware that the host has changed memory. */
+        ASMCompilerBarrier();
+        return VINF_SUCCESS;
+    }
+
+    return VERR_INVALID_PARAMETER;
+}