Changeset 69022 in vbox

Timestamp:

Oct 9, 2017 7:26:02 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: move vbox_err.h to include/VBox/Graphics/VBoxVideoErr.h.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

Since we do not want the upstream X.Org vboxvideo driver to depend on IPRT
either we move it from Additions/linux/drm to include/VBox/Graphics/ and
add a missing definition while we are at it.

Location:

trunk

Files:

• include/VBox/Graphics/VBoxVideoErr.h (moved) (moved from trunk/src/VBox/Additions/linux/drm/vbox_err.h ) (3 diffs)
• src/VBox/Additions/linux/drm/files_vboxvideo_drv (modified) (2 diffs)

trunk/include/VBox/Graphics/VBoxVideoErr.h

@@ +1 @@
+/* $Id$ */
 /** @file
  * VirtualBox Video driver, common code - iprt and VirtualBox macros and
@@ -24 +25 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Michael Thayer <michael.thayer@oracle.com>
  */
 
@@ -40 +43 @@
 #define VERR_NOT_SUPPORTED                  (-37)
 #define VERR_TOO_MUCH_DATA                  (-42)
+#define VERR_NOT_FOUND                      (-78)
 #define VERR_INVALID_STATE                  (-79)
 #define VERR_OUT_OF_RESOURCES               (-80)

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -27 +27 @@
     ${PATH_ROOT}/include/VBox/Graphics/HGSMIContext.h=>hgsmi_context.h \
     ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>hgsmi_defs.h \
+    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoErr.h=>vbox_err.h \
     ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>vboxvideo_vbe.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>hgsmi_base.c \
@@ -33 +34 @@
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.c=>vbox_drv.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_drv.h=>vbox_drv.h \
-    ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_err.h=>vbox_err.h \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_fb.c=>vbox_fb.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_irq.c=>vbox_irq.c \