Changeset 9252 in vbox

Timestamp:

May 30, 2008 1:27:13 PM (17 years ago)

Author:

vboxsync

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

31434

Message:

Additions/x11 and linux: make the Additions work with Fedora 9/X.org server 1.5

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/linux/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/x11/xgraphics/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/x11/xgraphics/vboxutils.c (modified) (5 diffs)
• src/VBox/Additions/x11/xgraphics/vboxvideo.h (modified) (2 diffs)
• src/VBox/Additions/x11/xgraphics/vboxvideo_15.c (added)
• src/VBox/Additions/x11/xmouse/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/x11/xmouse/VBoxUtils.c (modified) (1 diff)

trunk/Config.kmk

@@ -1045 +1045 @@
 VBOX_PATH_X11_XORG_1_3  = $(VBOX_PATH_X11_ROOT)/1.3
 VBOX_PATH_X11_XORG_1_4  = $(VBOX_PATH_X11_ROOT)/1.4
+VBOX_PATH_X11_XORG_1_5  = $(VBOX_PATH_X11_ROOT)/1.5
 
 #

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -86 +86 @@
                 $(PATH_BIN)/additions/vboxvideo_drv_13.so \
                 $(PATH_BIN)/additions/vboxvideo_drv_14.so \
+                $(PATH_BIN)/additions/vboxvideo_drv_15.so \
                 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_BIN)/additions/mountvboxsf \
                 $(VBOX_SELINUX_CMPLD) \
@@ -128 +129 @@
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so    $(PATH_TARGET)/install/vboxvideo_drv_13.so
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so    $(PATH_TARGET)/install/vboxvideo_drv_14.so
+        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so    $(PATH_TARGET)/install/vboxvideo_drv_15.so
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/mountvboxsf            $(PATH_TARGET)/install/mount.vboxsf
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_TARGET)/install

trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

@@ -184 +184 @@
 
 
+#
+# vboxvideo_drv_15
+#
+DLLS += vboxvideo_drv_15
+vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS
+vboxvideo_drv_15_INCS = \
+        $(VBOX_PATH_X11_XORG_1_5) \
+        $(VBOX_PATH_X11_XORG_1_5)/X11 \
+        $(VBOX_PATH_X11_XORG_1_5)/xorg
+vboxvideo_drv_15_SOURCES  = \
+        vboxvideo_15.c \
+        vboxutils.c
+
+
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

@@ -22 +22 @@
 #include <VBox/VBoxDev.h>
 
-#include <xf86Pci.h>
-#include <Pci.h>
+#ifndef PCIACCESS
+# include <xf86Pci.h>
+# include <Pci.h>
+#endif
 
 #include "xf86.h"
 #define NEED_XF86_TYPES
-#include "xf86_ansic.h"
+#ifdef NO_ANSIC
+# include <string.h>
+#else
+# include "xf86_ansic.h"
+#endif
 #include "compiler.h"
 #include "cursorstr.h"
@@ -181 +187 @@
     TRACE_EXIT();
 }
- 
+
 /**
  * Macro to disable VBVA extensions and return, for use when an
@@ -323 +329 @@
 }
 
+#ifdef PCIACCESS
+/* As of X.org server 1.5, we are using the pciaccess library functions to
+ * access PCI.  This structure describes our VMM device. */
+/** Structure describing the VMM device */
+static const struct pci_id_match vboxVMMDevID =
+{ VMMDEV_VENDORID, VMMDEV_DEVICEID, PCI_MATCH_ANY, PCI_MATCH_ANY,
+  PCI_MATCH_ANY, PCI_MATCH_ANY, 0 };
+#endif
 
 /**
@@ -332 +346 @@
 vboxInitVbva(int scrnIndex, ScreenPtr pScreen, VBOXPtr pVBox)
 {
+#ifdef PCIACCESS
+    struct pci_device_iterator *devIter = NULL;
+
+    TRACE_ENTRY();
+    pVBox->vmmDevInfo = NULL;
+    devIter = pci_id_match_iterator_create(&vboxVMMDevID);
+    if (devIter)
+    {
+        pVBox->vmmDevInfo = pci_device_next(devIter);
+        pci_iterator_destroy(devIter);
+    }
+    if (pVBox->vmmDevInfo)
+    {
+        pci_device_map_range(pVBox->vmmDevInfo,
+                             pVBox->vmmDevInfo->regions[1].base_addr,
+                             pVBox->vmmDevInfo->regions[1].size,
+                             PCI_DEV_MAP_FLAG_WRITABLE,
+                             (void **)&pVBox->pVMMDevMemory);
+    }
+#else
     PCITAG pciTag;
     ADDRESS pciAddress;
@@ -359 +393 @@
     pVBox->pVMMDevMemory = xf86MapPciMem(scrnIndex, 0, pciTag, pciAddress,
                                          sizeof(VMMDevMemory));
+#endif
     if (pVBox->pVMMDevMemory == NULL)
     {

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

@@ -64 +64 @@
 #include "xf86Resources.h"
 
+#ifndef NO_ANSIC
 /* All drivers need this */
-#include "xf86_ansic.h"
+# include "xf86_ansic.h"
+#endif
 
 #include "compiler.h"
 
+#ifndef PCIACCESS
 /* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
+# include "xf86PciInfo.h"
+/* Drivers that need to access the PCI config space directly need this */
+# include "xf86Pci.h"
+#endif
 
 #include "vgaHW.h"
-
-/* Drivers that need to access the PCI config space directly need this */
-#include "xf86Pci.h"
 
 /* VBE/DDC support */
 #include "vbe.h"
 #include "vbeModes.h"
-#include "xf86DDC.h"
 
 /* ShadowFB support */
@@ -133 +135 @@
     EntityInfoPtr pEnt;
     VbeInfoBlock *vbeInfo;
+#ifdef PCIACCESS
+    struct pci_device *pciInfo;
+    struct pci_device *vmmDevInfo;
+#else
     pciVideoPtr pciInfo;
     PCITAG pciTag;
+#endif
     CARD16 maxBytesPerScanline;
     unsigned long mapPhys, mapOff;

trunk/src/VBox/Additions/x11/xmouse/Makefile.kmk

@@ -101 +101 @@
 DLLS += vboxmouse_drv_14
 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
-vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS)
+vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_14_INCS := \
         $(VBOX_PATH_X11_XORG_1_4) \

trunk/src/VBox/Additions/x11/xmouse/VBoxUtils.c

@@ -26 +26 @@
 #include "xf86.h"
 #define NEED_XF86_TYPES
-#include "xf86_ansic.h"
+#ifdef NO_ANSIC
+# include <errno.h>
+# include <string.h>
+#else
+# include "xf86_ansic.h"
+#endif
 #include "compiler.h"