Madeorsk/xorg-xf86-video-remoteorsk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

Browse Source
This commit is contained in:
Kaleb Keithley 2003-11-25 19:28:36 +00:00
parent 106069b231
commit 77748634e7
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dummy.h
View File

@ -1,3 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* All drivers should typically include these */ /* All drivers should typically include these */
#include "xf86.h" #include "xf86.h"
@ -6,11 +7,8 @@
#include "xf86Cursor.h" #include "xf86Cursor.h"
#ifdef XvExtension
#include "xf86xv.h" #include "xf86xv.h"
#include "Xv.h" #include "Xv.h"
#endif /* XvExtension */
/* Supported chipsets */ /* Supported chipsets */
typedef enum { typedef enum {
@ -59,14 +57,12 @@ typedef struct dummyRec
int cursorFG, cursorBG; int cursorFG, cursorBG;
Bool screenSaver; Bool screenSaver;
#ifdef XvExtension
Bool video; Bool video;
XF86VideoAdaptorPtr overlayAdaptor; XF86VideoAdaptorPtr overlayAdaptor;
int overlay; int overlay;
int overlay_offset; int overlay_offset;
int videoKey; int videoKey;
int interlace; int interlace;
#endif /* XvExtension */
dummy_colors colors[256]; dummy_colors colors[256];
pointer* FBBase; pointer* FBBase;
} DUMMYRec, *DUMMYPtr; } DUMMYRec, *DUMMYPtr;

14
src/dummy_driver.c
View File

@ -1,3 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
/* /*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich * Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@ -7,7 +8,6 @@
#include "xf86.h" #include "xf86.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86_ansic.h" #include "xf86_ansic.h"
#include "xf86Bus.h"
/* This is used for module versioning */ /* This is used for module versioning */
#include "xf86Version.h" #include "xf86Version.h"
@ -29,10 +29,8 @@
#include "picturestr.h" #include "picturestr.h"
#ifdef XvExtension
#include "xf86xv.h" #include "xf86xv.h"
#include "Xv.h" #include "Xv.h"
#endif
/* /*
* Driver data structures. * Driver data structures.
@ -58,7 +56,7 @@ static Bool DUMMYEnterVT(int scrnIndex, int flags);
static void DUMMYLeaveVT(int scrnIndex, int flags); static void DUMMYLeaveVT(int scrnIndex, int flags);
static Bool DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen); static Bool DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen);
static void DUMMYFreeScreen(int scrnIndex, int flags); static void DUMMYFreeScreen(int scrnIndex, int flags);
static int DUMMYValidMode(int scrnIndex, DisplayModePtr mode, static ModeStatus DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags); Bool verbose, int flags);
static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode); static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
@ -325,7 +323,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->monitor = pScrn->confScreen->monitor; pScrn->monitor = pScrn->confScreen->monitor;
if (!xf86SetDepthBpp(pScrn, 8, 8, 8, Support24bppFb | Support32bppFb)) if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb))
return FALSE; return FALSE;
else { else {
/* Check that the returned depth is one we support */ /* Check that the returned depth is one we support */
@ -542,7 +540,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
DUMMYPtr dPtr; DUMMYPtr dPtr;
int ret; int ret;
VisualPtr visual; VisualPtr visual;
int height, width;
/* /*
* we need to get the ScrnInfoRec for this screen, so let's allocate * we need to get the ScrnInfoRec for this screen, so let's allocate
@ -582,9 +579,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
* Call the framebuffer layer's ScreenInit function, and fill in other * Call the framebuffer layer's ScreenInit function, and fill in other
* pScreen fields. * pScreen fields.
*/ */
width = pScrn->virtualX;
height = pScrn->virtualY;
ret = fbScreenInit(pScreen, dPtr->FBBase, ret = fbScreenInit(pScreen, dPtr->FBBase,
pScrn->virtualX, pScrn->virtualY, pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi, pScrn->xDpi, pScrn->yDpi,
@ -755,7 +749,7 @@ DUMMYSaveScreen(ScreenPtr pScreen, int mode)
} }
/* Optional */ /* Optional */
static int static ModeStatus
DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{ {
return(MODE_OK); return(MODE_OK);