Changeset 10656 in vbox for trunk/src/VBox/Additions/x11/xgraphics

Timestamp:

Jul 15, 2008 1:14:27 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: rewrote todos in the XFree86 graphics driver

File:

• trunk/src/VBox/Additions/x11/xgraphics/vboxutils_68.c (modified) (3 diffs)

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

@@ -30 +30 @@
 #include "compiler.h"
 #include "cursorstr.h"
-
-#ifndef RT_OS_SOLARIS
-#include <asm/ioctl.h>
-#endif
 
 #include "vboxvideo_68.h"
@@ -114 +110 @@
 
     TRACE_ENTRY ();
-#ifdef RT_OS_SOLARIS
-    err = vbglR3GRPerform(hdrp);
-    if (RT_FAILURE(err))
-    {
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VbglR3Perform failed. rc=%d\n", err);
-        err = -1;
-    }
+#ifdef RT_OS_LINUX
+    err = ioctl (pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(hdrp->size), hdrp);
 #else
-    /** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */
-    err = ioctl (pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(0), hdrp);
+/**
+ * @todo this should work fine on other platforms too, but it needs to be
+ *       checked for each one.
+ */
+# error port me!
 #endif
     if (err < 0)
@@ -150 +144 @@
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
             "Unable to determine whether the virtual machine supports mouse pointer integration - request initialization failed with return code %d\n", rc);
-/** @todo r=bird: Michael, ditto. */
+#ifdef RT_OS_LINUX
     if (   RT_SUCCESS(vrc)
         && (ioctl(pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0))
+#else
+# error port me!
+#endif
     {
         vrc = VERR_FILE_IO_ERROR;