Module Name: xsrc
Committed By: tsutsui
Date: Thu Jul 21 11:08:58 UTC 2011
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
Remove obsolete #ifdef HAVE_XF1BPP and #ifdef HAVE_XF4BPP blocks,
which have been removed on xorg-server 1.6.1.190 merge:
http://mail-index.NetBSD.org/source-changes/2009/06/11/msg222272.html
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.11 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.12
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.11 Tue May 17 22:28:15 2011
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Thu Jul 21 11:08:58 2011
@@ -62,12 +62,6 @@
#include "dgaproc.h"
/* For visuals */
-#ifdef HAVE_XF1BPP
-# include "xf1bpp.h"
-#endif
-#ifdef HAVE_XF4BPP
-# include "xf4bpp.h"
-#endif
#include "fb.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -655,18 +649,8 @@
/* Load bpp-specific modules. */
switch(pScrn->bitsPerPixel) {
-#ifdef HAVE_XF1BPP
case 1:
- mod = "xf1bpp";
- reqSym = "xf1bppScreenInit";
- break;
-#endif
-#ifdef HAVE_XF4BPP
case 4:
- mod = "xf4bpp";
- reqSym = "xf4bppScreenInit";
- break;
-#endif
default:
mod = "fb";
break;
@@ -856,21 +840,7 @@
switch (pScrn->bitsPerPixel) {
case 1:
-#ifdef HAVE_XF1BPP
- ret = xf1bppScreenInit(pScreen, fPtr->fbstart,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth);
- break;
-#endif
case 4:
-#ifdef HAVE_XF4BPP
- ret = xf4bppScreenInit(pScreen, fPtr->fbstart,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth);
- break;
-#endif
case 8:
case 16:
case 24:
