DRI XFree86-4_3_99_12-merge import

Merging XORG-CURRENT into trunk
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2026-03-25 18:10:06 +00:00 · 2004-06-16 09:23:04 +00:00 · 2004-04-23 19:31:36 +00:00 · 2004-03-14 08:33:20 +00:00 · 2004-03-03 12:12:18 +00:00 · 2004-02-26 13:35:52 +00:00
1 changed files with 7 additions and 10 deletions
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.44 2003/09/24 02:43:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.43 2003/04/23 21:51:35 tsi Exp $ */

 /*
 * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
@@ -377,7 +377,6 @@ 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;

@@ -533,7 +532,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86SetDpi(pScrn, 0, 0);

 	/* Load bpp-specific modules */
-	switch ((type = fbdevHWGetType(pScrn)))
+	switch (fbdevHWGetType(pScrn))
 	{
 	case FBDEVHW_PLANES:
 		mod = "afb";
@@ -574,7 +573,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
               return FALSE;
       default:
               xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-               "Fbdev type (%d) not supported yet.", type);
+               "Fbdev type (%d) not supported yet.");
               return FALSE;
 	}
 	if (mod && xf86LoadSubModule(pScrn, mod) == NULL) {
@@ -607,7 +606,6 @@ 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 +683,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 		fPtr->fbstart   = fPtr->fbmem + fPtr->fboff;
 	}

-	switch ((type = fbdevHWGetType(pScrn)))
+	switch (fbdevHWGetType(pScrn))
 	{
 #ifdef USE_AFB
 	case FBDEVHW_PLANES:
@@ -752,7 +750,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	default:
 		xf86DrvMsg(scrnIndex, X_ERROR,
 		"Internal error: fbdev type (%d) unsupported in"
-		" FBDevScreenInit\n", type);
+		" FBDevScreenInit\n");
 		ret = FALSE;
 		break;
 	}
@@ -805,7 +803,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	miDCInitialize(pScreen, xf86GetPointerScreenFuncs());

 	/* colormap */
-	switch ((type = fbdevHWGetType(pScrn)))
+	switch (fbdevHWGetType(pScrn))
 	{
 	/* XXX It would be simpler to use miCreateDefColormap() in all cases. */
 #ifdef USE_AFB
@@ -835,8 +833,7 @@ 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",
-		type);
+		"Internal error: invalid fbdev type (%d) in FBDevScreenInit\n");
 		return FALSE;
 	}
 	flags = CMAP_PALETTED_TRUECOLOR;
Author	SHA1	Message	Date
Eric Anholt	db6514cea0	DRI XFree86-4_3_99_12-merge import	2004-06-16 09:23:04 +00:00
Egbert Eich	1e80fe1bf9	Merging XORG-CURRENT into trunk	2004-04-23 19:31:36 +00:00
Egbert Eich	5d8a0a2e47	Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004	2004-03-14 08:33:20 +00:00
Egbert Eich	69d61895f3	Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004	2004-03-03 12:12:18 +00:00
Egbert Eich	806863c5f6	readding XFree86's cvs IDs	2004-02-26 13:35:52 +00:00
Egbert Eich	595a614cd9	Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004	2004-02-26 09:23:18 +00:00
Egbert Eich	62bec818a1	Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004	2004-01-29 08:08:35 +00:00
Kaleb Keithley	48e31aaed2	XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks	2003-11-25 19:28:36 +00:00
Kaleb Keithley	3a00d91359	XFree86 4.3.0.1	2003-11-14 16:48:55 +00:00