Changeset 65047 in vbox for trunk/src

Timestamp:

Jan 1, 2017 10:53:29 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8282: Additions/linux: submit DRM driver to the Linux kernel: rename VBoxVideoVBE.h to VBoxVideoHW.h in preparation for moving all guest-side parts from VBoxVideo.h to there and leaving only host-side parts in VBoxVideo.h

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp (modified) (1 diff)
• Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp (modified) (1 diff)
• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (1 diff)
• Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (1 diff)
• Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp (modified) (1 diff)
• Additions/WINNT/include/VBoxDisplay.h (modified) (1 diff)
• Additions/common/VBoxVideo/HGSMIBase.cpp (modified) (1 diff)
• Additions/common/VBoxVideo/Modesetting.cpp (modified) (1 diff)
• Additions/linux/drm/files_vboxvideo_drv (modified) (1 diff)
• Additions/x11/vboxvideo/vboxvideo.c (modified) (1 diff)
• Additions/x11/vboxvideo/vboxvideo.h (modified) (1 diff)
• Devices/Graphics/BIOS/vbe.h (modified) (1 diff)
• Devices/Graphics/DevVGA.h (modified) (2 diffs)
• Devices/Graphics/DevVGAModes.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• Main/xml/VirtualBox-settings.xsd (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp

@@ -18 +18 @@
 
 #include "VBoxMPCommon.h"
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 int VBoxMPCmnMapAdapterMemory(PVBOXMP_COMMON pCommon, void **ppv, uint32_t ulOffset, uint32_t ulSize)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

@@ -23 +23 @@
 #endif
 #include <wchar.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 #ifdef VBOX_WITH_WDDM

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -17 +17 @@
 
 #include "VBoxMPWddm.h"
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 #include <stdio.h>
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -29 +29 @@
 #include <wingdi.h> /* needed for RGNDATA definition */
 #include <VBoxDisplay.h> /* this is from Additions/WINNT/include/ to include escape codes */
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 #include <VBox/Version.h>
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include "VBoxMPInternal.h"
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/VBoxVideo.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

@@ -19 +19 @@
 #include "VBoxMPInternal.h"
 #include "common/VBoxMPCommon.h"
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/VBoxVideo.h>

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

@@ -84 +84 @@
 
 /* for VBOX_VIDEO_MAX_SCREENS definition */
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 typedef struct VBOXWDDM_RECOMMENDVIDPN_SOURCE

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

@@ -19 +19 @@
 #include <VBox/VBoxVideoGuest.h>
 #include <VBox/VBoxVideo.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 #include <iprt/asm.h>

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

@@ -19 +19 @@
 #include <VBox/VBoxVideoGuest.h>
 #include <VBox/VBoxVideo.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 #ifndef VBOX_GUESTR3XF86MOD

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

@@ -43 +43 @@
     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIDefs.h=>include/VBox/HGSMI/HGSMIDefs.h \
     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIMemAlloc.h=>include/VBox/HGSMI/HGSMIMemAlloc.h \
-    ${PATH_ROOT}/include/VBox/Hardware/VBoxVideoVBE.h=>include/VBox/Hardware/VBoxVideoVBE.h \
+    ${PATH_ROOT}/include/VBox/Hardware/VBoxVideoHW.h=>include/VBox/Hardware/VBoxVideoHW.h \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -57 +57 @@
 #include <VBox/VBoxGuest.h>
 #include <VBox/VBoxGuestLib.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 #include "version-generated.h"
 #include "product-generated.h"

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -103 +103 @@
 #define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
 
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 #include "xf86str.h"

trunk/src/VBox/Devices/Graphics/BIOS/vbe.h

@@ -4 +4 @@
 #include "vgabios.h"
 
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 // DISPI helper function

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -58 +58 @@
 #endif
 
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 #ifdef VBOX_WITH_HGSMI
@@ -82 +82 @@
 #ifdef CONFIG_BOCHS_VBE
 
-/* Cross reference with <VBox/Hardware/VBoxVideoVBE.h> */
+/* Cross reference with <VBox/Hardware/VBoxVideoHW.h> */
 #define VBE_DISPI_INDEX_NB_SAVED        0xb /* Number of saved registers (vbe_regs array) */
 #define VBE_DISPI_INDEX_NB              0xc /* Total number of VBE registers */

trunk/src/VBox/Devices/Graphics/DevVGAModes.h

@@ -21 +21 @@
 #ifdef VBE_NEW_DYN_LIST
 
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 
 /* VBE Mode Numbers */

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -33 +33 @@
 
 #include <VBox/VBoxVideo.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBox/Hardware/VBoxVideoHW.h>
 #include <VBox/VBoxVideo3D.h>
 #include <VBox/VBoxVideoHost3D.h>

trunk/src/VBox/Main/xml/VirtualBox-settings.xsd

@@ -140 +140 @@
   <xsd:restriction base="xsd:unsignedInt">
     <xsd:minInclusive value="1"/>
-    <!-- This should be in sync with VBOX_VIDEO_MAX_SCREENS in VBoxVideoVBE.h -->
+    <!-- This should be in sync with VBOX_VIDEO_MAX_SCREENS in VBoxVideoHW.h -->
     <xsd:maxInclusive value="64"/>
   </xsd:restriction>