diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:03 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:03 +0000 |
| commit | a571d5efb53cfe793d61d1b48c2bddc8d337d381 (patch) | |
| tree | 540c081a61fede68e9818b22daeeb9a84507304f | |
| parent | 289ef4abc51e6ba8e902db4093cb5380721cbfe7 (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge
| -rw-r--r-- | src/dummy.h | 2 | ||||
| -rw-r--r-- | src/dummy_driver.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/dummy.h b/src/dummy.h index 2727925..edffc4e 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $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" diff --git a/src/dummy_driver.c b/src/dummy_driver.c index bca78f8..4ad5670 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.4 2003/08/23 15:02:57 dawes Exp $ */ /* * Copyright 2002, SuSE Linux AG, Author: Egbert Eich @@ -56,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 ModeStatus DUMMYValidMode(int scrnIndex, DisplayModePtr mode, +static int DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode); @@ -149,7 +149,7 @@ static XF86ModuleVersionInfo dummyVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, DUMMY_MAJOR_VERSION, DUMMY_MINOR_VERSION, DUMMY_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -471,10 +471,6 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags) RETURN; xf86LoaderReqSymLists(ramdacSymbols, NULL); } - - /* We have no contiguous physical fb in physical memory */ - pScrn->memPhysBase = 0; - pScrn->fbOffset = 0; return TRUE; } @@ -544,6 +540,7 @@ 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 @@ -583,6 +580,9 @@ 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, @@ -753,7 +753,7 @@ DUMMYSaveScreen(ScreenPtr pScreen, int mode) } /* Optional */ -static ModeStatus +static int DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { return(MODE_OK); |