From 48e31aaed2340998e4e3b62aaae41d6fbce0ca88 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:36 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- src/fbdev.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/fbdev.c b/src/fbdev.c index dac70d5..de568f6 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.42 2002/10/10 01:35:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.44 2003/09/24 02:43:21 dawes Exp $ */ /* * Authors: Alan Hourihane, @@ -29,9 +29,7 @@ #include "fbdevhw.h" -#ifdef XvExtension #include "xf86xv.h" -#endif #define DEBUG 0 @@ -379,6 +377,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) int default_depth, fbbpp; const char *mod = NULL, *s; const char **syms = NULL; + int type; if (flags & PROBE_DETECT) return FALSE; @@ -534,7 +533,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) xf86SetDpi(pScrn, 0, 0); /* Load bpp-specific modules */ - switch (fbdevHWGetType(pScrn)) + switch ((type = fbdevHWGetType(pScrn))) { case FBDEVHW_PLANES: mod = "afb"; @@ -575,7 +574,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; default: xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Fbdev type (%d) not supported yet."); + "Fbdev type (%d) not supported yet.", type); return FALSE; } if (mod && xf86LoadSubModule(pScrn, mod) == NULL) { @@ -608,6 +607,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) VisualPtr visual; int init_picture = 0; int ret,flags,width,height; + int type; TRACE_ENTER("FBDevScreenInit"); @@ -685,7 +685,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) fPtr->fbstart = fPtr->fbmem + fPtr->fboff; } - switch (fbdevHWGetType(pScrn)) + switch ((type = fbdevHWGetType(pScrn))) { #ifdef USE_AFB case FBDEVHW_PLANES: @@ -752,7 +752,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) default: xf86DrvMsg(scrnIndex, X_ERROR, "Internal error: fbdev type (%d) unsupported in" - " FBDevScreenInit\n"); + " FBDevScreenInit\n", type); ret = FALSE; break; } @@ -805,7 +805,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); /* colormap */ - switch (fbdevHWGetType(pScrn)) + switch ((type = fbdevHWGetType(pScrn))) { /* XXX It would be simpler to use miCreateDefColormap() in all cases. */ #ifdef USE_AFB @@ -835,7 +835,8 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; default: xf86DrvMsg(scrnIndex, X_ERROR, - "Internal error: invalid fbdev type (%d) in FBDevScreenInit\n"); + "Internal error: invalid fbdev type (%d) in FBDevScreenInit\n", + type); return FALSE; } flags = CMAP_PALETTED_TRUECOLOR; @@ -850,7 +851,6 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) fPtr->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = FBDevCloseScreen; -#ifdef XvExtension { XF86VideoAdaptorPtr *ptr; @@ -859,7 +859,6 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) xf86XVScreenInit(pScreen,ptr,n); } } -#endif TRACE_EXIT("FBDevScreenInit"); -- cgit v1.2.3