diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-07-13 14:01:31 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-07-13 14:01:31 +0000 |
| commit | 63eb194b3a498db195f97bd2dc5141d26f7739a1 (patch) | |
| tree | fea7b6b41241fbd70b0866dae1ad6c568f92ed11 /driver/xf86-video-wsfb | |
| parent | 0329a5806fe19775e2d1d8807361bfa94a298e9a (diff) | |
Remove obsolete #ifdef HAVE_XF1BPP and #ifdef HAVE_XF4BPP blocks,
Diffstat (limited to 'driver/xf86-video-wsfb')
| -rw-r--r-- | driver/xf86-video-wsfb/src/wsfb_driver.c | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/driver/xf86-video-wsfb/src/wsfb_driver.c b/driver/xf86-video-wsfb/src/wsfb_driver.c index ebbd7fd96..e8a5f298e 100644 --- a/driver/xf86-video-wsfb/src/wsfb_driver.c +++ b/driver/xf86-video-wsfb/src/wsfb_driver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfb_driver.c,v 1.33 2014/07/13 10:13:19 matthieu Exp $ */ +/* $OpenBSD: wsfb_driver.c,v 1.34 2014/07/13 14:01:30 matthieu Exp $ */ /* * Copyright © 2001-2012 Matthieu Herrb * All rights reserved. @@ -61,12 +61,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 @@ -400,7 +394,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags) WsfbPtr fPtr; int defaultDepth, depths, flags24; const char *dev; - char *mod = NULL, *s; + char *s; const char *reqSym = NULL; Gamma zeros = {0.0, 0.0, 0.0}; DisplayModePtr mode; @@ -760,25 +754,6 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags) /* Set the display resolution. */ xf86SetDpi(pScrn, 0, 0); - /* 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; - } - /* Load shadow if needed. */ if (fPtr->shadowFB) { @@ -789,7 +764,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } } - if (mod && xf86LoadSubModule(pScrn, mod) == NULL) { + if (xf86LoadSubModule(pScrn, "fb") == NULL) { WsfbFreeRec(pScrn); return FALSE; } @@ -969,21 +944,7 @@ WsfbScreenInit(SCREEN_INIT_ARGS_DECL) switch (pScrn->bitsPerPixel) { case 1: -#ifdef HAVE_XF1BPP - ret = xf1bppScreenInit(pScreen, fPtr->fbstart, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - fPtr->linebytes * 8); - break; -#endif case 4: -#ifdef HAVE_XF4BPP - ret = xf4bppScreenInit(pScreen, fPtr->fbstart, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - fPtr->linebytes * 2); - break; -#endif case 8: case 16: case 24: |