Changeset 43081 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Aug 29, 2012 3:16:49 PM (12 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: some header file inclusion clean-up.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• pointer.c (modified) (1 diff)
• setmode.c (modified) (1 diff)
• vboxvideo.c (modified) (5 diffs)
• vboxvideo.h (modified) (4 diffs)
• vboxvideo_dri.c (modified) (1 diff)
• vbva.c (modified) (1 diff)

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

@@ -28 +28 @@
 #include "compiler.h"
 #include "cursorstr.h"
+#include "servermd.h"
 
 #include "vboxvideo.h"

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

@@ -54 +54 @@
 #endif
 #include "vboxvideo.h"
-#include <iprt/asm-math.h>
 #include "version-generated.h"
 #include "product-generated.h"
-#include <xf86.h>
-#include <misc.h>
-
-/* All drivers initialising the SW cursor need this */
-#include "mipointer.h"
-
-/* Colormap handling */
-#include "micmap.h"
-#include "xf86cmap.h"
-
-/* DPMS */
-/* #define DPMS_SERVER
-#include "extensions/dpms.h" */
+#include "xf86.h"
 
 /* VGA hardware functions for setting and restoring text mode */

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

@@ -53 +53 @@
 # include <string.h>
 #endif
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+# include "xf86Resources.h"
+#endif
+
+#ifndef PCIACCESS
+/* Drivers for PCI hardware need this */
+# include "xf86PciInfo.h"
+/* Drivers that need to access the PCI config space directly need this */
+# include "xf86Pci.h"
+#endif
+
+#include "fb.h"
+
 #include "vboxvideo.h"
 #include <iprt/asm-math.h>
@@ -110 +126 @@
 static void VBOXSaveMode(ScrnInfoPtr pScrn);
 static void VBOXRestoreMode(ScrnInfoPtr pScrn);
+
+static inline void VBOXSetRec(ScrnInfoPtr pScrn)
+{
+    if (!pScrn->driverPrivate)
+        pScrn->driverPrivate = calloc(sizeof(VBOXRec), 1);
+}
 
 enum GenericTypes
@@ -583 +605 @@
                                 NULL, NULL, NULL, NULL, NULL);
     if (pScrn != NULL) {
-        VBOXPtr pVBox = VBOXGetRec(pScrn);
-
+        VBOXPtr pVBox;
+
+        VBOXSetRec(pScrn);
+        pVBox = VBOXGetRec(pScrn);
+        if (!pVBox)
+            return FALSE;
         pScrn->driverVersion = VBOX_VERSION;
         pScrn->driverName    = VBOX_DRIVER_NAME;
@@ -678 +704 @@
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    
     VBOXPtr pVBox = VBOXGetRec(pScrn);
 
     TRACE_LOG("enable=%s\n", enable ? "TRUE" : "FALSE");
+    VBOXSetRec(pScrn);
     pVBox->accessEnabled = enable;
     pVBox->EnableDisableFBAccess(scrnIndex, enable);
@@ -728 +756 @@
 
     /* Get our private data from the ScrnInfoRec structure. */
+    VBOXSetRec(pScrn);
     pVBox = VBOXGetRec(pScrn);
     if (!pVBox)

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

@@ -55 +55 @@
 #include <VBox/VBoxVideoGuest.h>
 #include <VBox/VBoxVideo.h>
-
-#include <iprt/asm-math.h>
 
 #ifdef DEBUG
@@ -102 +100 @@
 #include <VBox/VMMDev.h>
 
-/* All drivers should typically include these */
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-# include "xf86Resources.h"
-#endif
-
-#include <iprt/string.h>
-#include "compiler.h"
-
-#ifndef PCIACCESS
-/* Drivers for PCI hardware need this */
-# include "xf86PciInfo.h"
-/* Drivers that need to access the PCI config space directly need this */
-# include "xf86Pci.h"
-#endif
-
-/* ShadowFB support */
-#include "shadowfb.h"
-
-/* Dga definitions */
-#include "dgaproc.h"
-
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-# include "xf86RAC.h"
-#endif
-
-#include "fb.h"
+#include "xf86str.h"
+#include "xf86Cursor.h"
 
 #define VBOX_VERSION            4000  /* Why? */
-#include "xf86Cursor.h"
 #define VBOX_NAME                     "VBoxVideo"
 #define VBOX_DRIVER_NAME          "vboxvideo"
@@ -278 +249 @@
 static inline VBOXPtr VBOXGetRec(ScrnInfoPtr pScrn)
 {
-    if (!pScrn->driverPrivate)
-    {
-        pScrn->driverPrivate = calloc(sizeof(VBOXRec), 1);
-    }
-
     return ((VBOXPtr)pScrn->driverPrivate);
 }
@@ -302 +268 @@
 static inline int32_t vboxDisplayPitch(ScrnInfoPtr pScrn, int32_t cbLine)
 {
-    return ASMDivU64ByU32RetU32((uint64_t)cbLine * 8, vboxBPP(pScrn));
+    return (int32_t)((uint64_t)cbLine * 8 / vboxBPP(pScrn));
 }
 

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

@@ -47 +47 @@
  */
 
+#include "xf86.h"
 #include "vboxvideo.h"
 #ifndef PCIACCESS

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

@@ -27 +27 @@
 #include <iprt/string.h>
 #include "compiler.h"
+
+/* ShadowFB support */
+#include "shadowfb.h"
 
 #include "vboxvideo.h"