diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
| commit | 77748634e71f2c42d03d708515e65351f0b755cb (patch) | |
| tree | ed54fd6ab9f926e583c99960d3bf949297b3b4d7 /src | |
| parent | 106069b23188837f06b1057e03db24cad2018ea3 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'src')
| -rw-r--r-- | src/dummy.h | 10 | ||||
| -rw-r--r-- | src/dummy_driver.c | 14 |
2 files changed, 7 insertions, 17 deletions
diff --git a/src/dummy.h b/src/dummy.h index 3f9243d..edffc4e 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -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 */ #include "xf86.h" @@ -6,11 +7,8 @@ #include "xf86Cursor.h" -#ifdef XvExtension -# include "xf86xv.h" -# include "Xv.h" -#endif /* XvExtension */ - +#include "xf86xv.h" +#include "Xv.h" /* Supported chipsets */ typedef enum { @@ -59,14 +57,12 @@ typedef struct dummyRec int cursorFG, cursorBG; Bool screenSaver; -#ifdef XvExtension Bool video; XF86VideoAdaptorPtr overlayAdaptor; int overlay; int overlay_offset; int videoKey; int interlace; -#endif /* XvExtension */ dummy_colors colors[256]; pointer* FBBase; } DUMMYRec, *DUMMYPtr; diff --git a/src/dummy_driver.c b/src/dummy_driver.c index d95edb0..224b9e2 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -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 @@ -7,7 +8,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" -#include "xf86Bus.h" /* This is used for module versioning */ #include "xf86Version.h" @@ -29,10 +29,8 @@ #include "picturestr.h" -#ifdef XvExtension #include "xf86xv.h" #include "Xv.h" -#endif /* * Driver data structures. @@ -58,7 +56,7 @@ static Bool DUMMYEnterVT(int scrnIndex, int flags); static void DUMMYLeaveVT(int scrnIndex, int flags); static Bool DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen); 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); static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode); @@ -325,7 +323,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags) pScrn->monitor = pScrn->confScreen->monitor; - if (!xf86SetDepthBpp(pScrn, 8, 8, 8, Support24bppFb | Support32bppFb)) + if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb)) return FALSE; else { /* Check that the returned depth is one we support */ @@ -542,7 +540,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) DUMMYPtr dPtr; int ret; VisualPtr visual; - int height, width; /* * 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 * pScreen fields. */ - width = pScrn->virtualX; - height = pScrn->virtualY; - ret = fbScreenInit(pScreen, dPtr->FBBase, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, @@ -755,7 +749,7 @@ DUMMYSaveScreen(ScreenPtr pScreen, int mode) } /* Optional */ -static int +static ModeStatus DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { return(MODE_OK); |