[PATCH] xfree86: Remove the xf8_16bpp overlay module
Adam Jackson
ajax at redhat.com
Mon Nov 29 11:18:41 PST 2010
Only one (marginal) driver was using it, and it's been fixed to just
implement it directly.
v2: Also fix sdksyms.sh (spotted by Jesse Adkins)
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
configure.ac | 1 -
hw/xfree86/Makefile.am | 4 +-
hw/xfree86/loader/sdksyms.sh | 6 ---
hw/xfree86/xf8_16bpp/Makefile.am | 11 -----
hw/xfree86/xf8_16bpp/cfb8_16.h | 37 ----------------
hw/xfree86/xf8_16bpp/xf8_16module.c | 78 -----------------------------------
6 files changed, 2 insertions(+), 135 deletions(-)
delete mode 100644 hw/xfree86/xf8_16bpp/Makefile.am
delete mode 100644 hw/xfree86/xf8_16bpp/cfb8_16.h
delete mode 100644 hw/xfree86/xf8_16bpp/xf8_16module.c
diff --git a/configure.ac b/configure.ac
index bd027cd..abbe981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2238,7 +2238,6 @@ hw/xfree86/vbe/Makefile
hw/xfree86/vgahw/Makefile
hw/xfree86/x86emu/Makefile
hw/xfree86/xaa/Makefile
-hw/xfree86/xf8_16bpp/Makefile
hw/xfree86/utils/Makefile
hw/xfree86/utils/cvt/Makefile
hw/xfree86/utils/gtf/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 116113b..575481e 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -32,12 +32,12 @@ DOC_SUBDIR = doc
SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
- xf8_16bpp loader dixmods exa modes \
+ loader dixmods exa modes \
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
parser ramdac shadowfb vbe vgahw xaa \
- xf8_16bpp loader dixmods dri dri2 exa modes \
+ loader dixmods dri dri2 exa modes \
utils doc
bin_PROGRAMS = Xorg
diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 3804324..3f32419 100755
--- a/hw/xfree86/loader/sdksyms.sh
+++ b/hw/xfree86/loader/sdksyms.sh
@@ -208,12 +208,6 @@ cat > sdksyms.c << EOF
*/
-/* hw/xfree86/xf8_16bpp/Makefile.am -- module */
-/*
-#include "cfb8_16.h"
- */
-
-
/* mi/Makefile.am */
#include "micmap.h"
#include "miline.h"
diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am
deleted file mode 100644
index 3c5b8c9..0000000
--- a/hw/xfree86/xf8_16bpp/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-module_LTLIBRARIES = libxf8_16bpp.la
-
-sdk_HEADERS = cfb8_16.h
-
-INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-libxf8_16bpp_la_LDFLAGS = -avoid-version
-
-libxf8_16bpp_la_SOURCES = xf8_16module.c
diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h
deleted file mode 100644
index b6ab955..0000000
--- a/hw/xfree86/xf8_16bpp/cfb8_16.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2006 Adam Jackson.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _CFB8_16_H
-#define _CFB8_16_H
-
-#include "regionstr.h"
-#include "windowstr.h"
-
-/* this has to stay misnamed for ABI reasons */
-
-extern _X_EXPORT Bool
-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
- int xsize, int ysize, int dpix, int dpiy,
- int width16, int width8);
-
-#endif /* _CFB8_16_H */
diff --git a/hw/xfree86/xf8_16bpp/xf8_16module.c b/hw/xfree86/xf8_16bpp/xf8_16module.c
deleted file mode 100644
index 6a4529a..0000000
--- a/hw/xfree86/xf8_16bpp/xf8_16module.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2006 Adam Jackson.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include "misc.h"
-#include "servermd.h"
-#include "scrnintstr.h"
-#include "resource.h"
-#include "fb.h"
-#include "fboverlay.h"
-#include "cfb8_16.h"
-
-Bool
-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
- int xsize, int ysize, int dpix, int dpiy,
- int width16, int width8)
-{
- return
- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
- dpix, dpiy, width16, width8, 16, 8) &&
- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
- dpix, dpiy, width16, width8, 16, 8, 16, 8));
-}
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(xf8_16bppSetup);
-
-static XF86ModuleVersionInfo VersRec = {
- "xf8_16bpp",
- MODULEVENDORSTRING,
- MODINFOSTRING1,
- MODINFOSTRING2,
- XORG_VERSION_CURRENT,
- 2, 0, 0,
- ABI_CLASS_ANSIC, /* Only need the ansic layer */
- ABI_ANSIC_VERSION,
- NULL,
- {0,0,0,0} /* signature, to be patched into the file by a tool */
-};
-
-_X_EXPORT XF86ModuleData xf8_16bppModuleData = {
- &VersRec,
- xf8_16bppSetup,
- NULL
-};
-
-static pointer
-xf8_16bppSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
- return (pointer)LoadSubModule(module, "fb", NULL, NULL, NULL, NULL,
- errmaj, errmin);
-}
--
1.7.3.2
More information about the xorg-devel
mailing list