Changeset 7086 in vbox for trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h

Timestamp:

Feb 21, 2008 8:06:06 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: reverted the XFree86/X.org 6.8 additions to their old state (not using IPRT or the guest library)

File:

• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h (copied) (copied from trunk/src/VBox/Additions/x11/xgraphics/vboxvideo.h ) (6 diffs)

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

@@ -75 +75 @@
 /* VBE/DDC support */
 #include "vbe.h"
-#ifdef XORG_7X
-#include "vbeModes.h"
-#endif
 #include "xf86DDC.h"
 
@@ -118 +115 @@
 #include "afb.h"
 #include "mfb.h"
-#ifndef XORG_7X
-#include "cfb24_32.h"
-#endif
 
 #define VBOX_VERSION            4000
@@ -137 +131 @@
     PCITAG pciTag;
     CARD16 maxBytesPerScanline;
-#ifdef XORG_7X
-    unsigned long mapPhys, mapOff;
-    int mapSize;        /* video memory */
-#else
     int mapPhys, mapOff, mapSize;       /* video memory */
-#endif
     void *base, *VGAbase;
     CARD8 *state, *pstate;      /* SVGA state */
@@ -153 +142 @@
     CloseScreenProcPtr CloseScreen;
     OptionInfoPtr Options;
-#ifdef XORG_7X
-    IOADDRESS ioBase;
-#endif  /* XORG_7X defined */
-#if 0
     int vbox_fd;
-#endif
     VMMDevReqMousePointer *reqp;
     xf86CursorInfoPtr pCurs;
@@ -166 +150 @@
     Bool pointerOffscreen;
     Bool useVbva;
-#if 0
     VMMDevVideoAccelFlush *reqf; 
     VMMDevVideoAccelEnable *reqe; 
-#endif
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;
 } VBOXRec, *VBOXPtr;
 
-#ifndef XORG_7X
 typedef struct _ModeInfoData
 {
@@ -181 +162 @@
     VbeCRTCInfoBlock *block;
 } ModeInfoData;
-#endif
 
 Bool vbox_cursor_init (ScreenPtr pScreen);