diff options
author | Matthieu Herrb <matthieu@herrb.eu> | 2014-07-13 16:04:35 +0200 |
---|---|---|
committer | Matthieu Herrb <matthieu@herrb.eu> | 2014-07-13 16:41:11 +0200 |
commit | 16ac29883cb80053fb0b973166a3f664cae1fa44 (patch) | |
tree | 30af415d280435e13b2894f402f6290bacc40bdd | |
parent | 1c1bf30b612933a3303d414c75671c9a05ec450a (diff) |
Remove obsolete #ifdef HAVE_XF1BPP and #ifdef HAVE_XF4BPP blocks,
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | src/wsfb_driver.c | 43 |
2 files changed, 2 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac index 19a2842..accc4b0 100644 --- a/configure.ac +++ b/configure.ac @@ -64,12 +64,6 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES]) # Checks for libraries. -# Check for xf1bpp & xf4bpp (removed in xorg-server 1.6 & later) -SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" -AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) -AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) -CPPFLAGS="$SAVE_CPPFLAGS" AC_SUBST([moduledir]) diff --git a/src/wsfb_driver.c b/src/wsfb_driver.c index 8b9f417..cf78e1d 100644 --- a/src/wsfb_driver.c +++ b/src/wsfb_driver.c @@ -60,12 +60,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 @@ -398,7 +392,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags) WsfbPtr fPtr; int default_depth, wstype; const char *dev; - char *mod = NULL, *s; + char *s; Gamma zeros = {0.0, 0.0, 0.0}; DisplayModePtr mode; @@ -624,25 +618,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) { @@ -653,7 +628,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } } - if (mod && xf86LoadSubModule(pScrn, mod) == NULL) { + if (xf86LoadSubModule(pScrn, "fb") == NULL) { WsfbFreeRec(pScrn); return FALSE; } @@ -825,21 +800,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: |