xfree86: Remove the xf8_16bpp overlay module
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) v3: Also fix DESIGN.xml (spotted bu Julien Cristau) Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
a861fe6a1c
commit
b85f9063c2
|
@ -2237,7 +2237,6 @@ hw/xfree86/vbe/Makefile
|
||||||
hw/xfree86/vgahw/Makefile
|
hw/xfree86/vgahw/Makefile
|
||||||
hw/xfree86/x86emu/Makefile
|
hw/xfree86/x86emu/Makefile
|
||||||
hw/xfree86/xaa/Makefile
|
hw/xfree86/xaa/Makefile
|
||||||
hw/xfree86/xf8_16bpp/Makefile
|
|
||||||
hw/xfree86/utils/Makefile
|
hw/xfree86/utils/Makefile
|
||||||
hw/xfree86/utils/cvt/Makefile
|
hw/xfree86/utils/cvt/Makefile
|
||||||
hw/xfree86/utils/gtf/Makefile
|
hw/xfree86/utils/gtf/Makefile
|
||||||
|
|
|
@ -32,12 +32,12 @@ DOC_SUBDIR = doc
|
||||||
|
|
||||||
SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
|
SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
|
||||||
ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
|
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)
|
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
|
||||||
|
|
||||||
DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
|
DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
|
||||||
parser ramdac shadowfb vbe vgahw xaa \
|
parser ramdac shadowfb vbe vgahw xaa \
|
||||||
xf8_16bpp loader dixmods dri dri2 exa modes \
|
loader dixmods dri dri2 exa modes \
|
||||||
utils doc
|
utils doc
|
||||||
|
|
||||||
bin_PROGRAMS = Xorg
|
bin_PROGRAMS = Xorg
|
||||||
|
|
|
@ -1628,14 +1628,6 @@ Here is what <function>InitOutput()</function> does:
|
||||||
|
|
||||||
</blockquote></para></blockquote>
|
</blockquote></para></blockquote>
|
||||||
|
|
||||||
<para>
|
|
||||||
Currently, aperture remapping, as described here, should not be
|
|
||||||
attempted if the driver uses the <literal remap="tt">xf8_16bpp</literal> or
|
|
||||||
<literal remap="tt">xf8_32bpp</literal> framebuffer layers. A pending
|
|
||||||
restructuring of VT switching will address this restriction in
|
|
||||||
the near future.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
Other layers may wrap the <function>ChipEnterVT()</function> and
|
Other layers may wrap the <function>ChipEnterVT()</function> and
|
||||||
<function>ChipLeaveVT()</function> functions if they need to take some
|
<function>ChipLeaveVT()</function> functions if they need to take some
|
||||||
|
|
|
@ -208,12 +208,6 @@ cat > sdksyms.c << EOF
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/* hw/xfree86/xf8_16bpp/Makefile.am -- module */
|
|
||||||
/*
|
|
||||||
#include "cfb8_16.h"
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/* mi/Makefile.am */
|
/* mi/Makefile.am */
|
||||||
#include "micmap.h"
|
#include "micmap.h"
|
||||||
#include "miline.h"
|
#include "miline.h"
|
||||||
|
|
|
@ -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
|
|
|
@ -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 */
|
|
|
@ -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);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user