[PATCH 11/12] xfree86: Remove xf86InitVidMem
Adam Jackson
ajax at redhat.com
Tue Jul 29 12:00:18 PDT 2014
Completely useless at this point, none of the OS/platform backends have
any side-effects anymore.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
configure.ac | 9 +----
hw/xfree86/os-support/Makefile.am | 2 +-
hw/xfree86/os-support/bsd/Makefile.am | 2 --
hw/xfree86/os-support/bsd/alpha_video.c | 7 ----
hw/xfree86/os-support/bsd/arm_video.c | 7 ----
hw/xfree86/os-support/bsd/bsd_ev56.c | 1 -
hw/xfree86/os-support/bsd/i386_video.c | 7 ----
hw/xfree86/os-support/bsd/ppc_video.c | 8 -----
hw/xfree86/os-support/bsd/sparc64_video.c | 45 -------------------------
hw/xfree86/os-support/bus/Makefile.am | 4 ---
hw/xfree86/os-support/bus/Pci.c | 9 +----
hw/xfree86/os-support/bus/Pci.h | 10 ------
hw/xfree86/os-support/bus/bsd_pci.c | 55 -------------------------------
hw/xfree86/os-support/hurd/Makefile.am | 1 -
hw/xfree86/os-support/hurd/hurd_video.c | 7 ----
hw/xfree86/os-support/linux/Makefile.am | 1 -
hw/xfree86/os-support/linux/lnx_agp.c | 1 -
hw/xfree86/os-support/linux/lnx_video.c | 11 -------
hw/xfree86/os-support/shared/agp_noop.c | 1 -
hw/xfree86/os-support/shared/vidmem.c | 54 ------------------------------
hw/xfree86/os-support/solaris/Makefile.am | 1 -
hw/xfree86/os-support/solaris/sun_vid.c | 11 -------
hw/xfree86/os-support/stub/Makefile.am | 4 +--
hw/xfree86/os-support/stub/stub_video.c | 13 --------
hw/xfree86/os-support/xf86OSpriv.h | 41 -----------------------
hw/xfree86/os-support/xf86_OSproc.h | 3 --
26 files changed, 4 insertions(+), 311 deletions(-)
delete mode 100644 hw/xfree86/os-support/bsd/sparc64_video.c
delete mode 100644 hw/xfree86/os-support/bus/bsd_pci.c
delete mode 100644 hw/xfree86/os-support/shared/vidmem.c
delete mode 100644 hw/xfree86/os-support/stub/stub_video.c
delete mode 100644 hw/xfree86/os-support/xf86OSpriv.h
diff --git a/configure.ac b/configure.ac
index e4d3d43..a35c32e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,7 +326,7 @@ case $host_cpu in
;;
sparc*)
SPARC64_VIDEO=yes
- BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
+ BSD_ARCH_SOURCES="ioperm_noop.c"
GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
;;
x86_64*|amd64*)
@@ -1863,7 +1863,6 @@ if test "x$XORG" = xyes; then
dnl ===================================================================
dnl ================= beginning of PCI configuration ==================
dnl ===================================================================
- xorg_bus_bsdpci=no
xorg_bus_sparc=no
AC_MSG_CHECKING([whether to build Xorg PCI functions])
@@ -1875,11 +1874,6 @@ if test "x$XORG" = xyes; then
AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
- case $host_os in
- gnu* | freebsd* | kfreebsd*-gnu | netbsd* | openbsd* | solaris* | dragonfly*)
- xorg_bus_bsdpci="yes"
- ;;
- esac
case $host_cpu in
sparc*)
xorg_bus_sparc="yes"
@@ -2077,7 +2071,6 @@ if test "x$XORG" = xyes; then
fi
AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
-AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index a0140a1..146610e 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -3,7 +3,7 @@ DIST_SUBDIRS = bsd bus misc linux solaris stub hurd
sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h
-EXTRA_DIST = int10Defines.h xf86OSpriv.h
+EXTRA_DIST = int10Defines.h
# to get the grouping semantics right, you have to glom these three together
# as one library, otherwise libtool will actively defeat your attempts to
diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
index b01ea5b..33e013c 100644
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/hw/xfree86/os-support/bsd/Makefile.am
@@ -45,7 +45,6 @@ endif
if SPARC64_VIDEO
# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
ARCH_SOURCES = \
- sparc64_video.c \
$(srcdir)/../shared/ioperm_noop.c
endif
@@ -57,7 +56,6 @@ AM_CPPFLAGS = $(XORG_INCS)
libbsd_la_SOURCES = \
$(srcdir)/../shared/posix_tty.c \
$(srcdir)/../shared/sigio.c \
- $(srcdir)/../shared/vidmem.c \
bsd_VTsw.c \
bsd_init.c \
bsd_bell.c \
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index fd8f823..b98c585 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -37,7 +37,6 @@
#endif
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
@@ -45,12 +44,6 @@
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
-
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
extern int ioperm(unsigned long from, unsigned long num, int on);
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index fea8528..da69437 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -64,7 +64,6 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
@@ -72,12 +71,6 @@
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
-
#ifdef USE_DEV_IO
static int IoFd = -1;
diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c
index 9588349..8a00273 100644
--- a/hw/xfree86/os-support/bsd/bsd_ev56.c
+++ b/hw/xfree86/os-support/bsd/bsd_ev56.c
@@ -11,7 +11,6 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
#include <machine/bwx.h>
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index ffe97aa..f0be6e9 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -35,7 +35,6 @@
#include <sys/mman.h>
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
#if defined(__NetBSD__) && !defined(MAP_FILE)
#define MAP_FLAGS MAP_SHARED
@@ -49,12 +48,6 @@
"\trefer to xf86(4) for details"
#endif
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
-
#ifdef USE_I386_IOPL
/***************************************************************************/
/* I/O Permissions section */
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index f017376..2308b03 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -32,8 +32,6 @@
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-
#include "bus/Pci.h"
/***************************************************************************/
@@ -47,12 +45,6 @@
Bool xf86EnableIO(void);
void xf86DisableIO(void);
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
-
volatile unsigned char *ioBase = MAP_FAILED;
Bool
diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c
deleted file mode 100644
index 5bed017..0000000
--- a/hw/xfree86/os-support/bsd/sparc64_video.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 1992 by Rich Murphey <Rich at Rice.edu>
- * Copyright 1993 by David Wexelblat <dwex at goblin.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Rich Murphey and David Wexelblat
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. Rich Murphey and
- * David Wexelblat make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "xf86.h"
-#include "xf86Priv.h"
-
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-
-/***************************************************************************/
-/* Video Memory Mapping section */
-/***************************************************************************/
-
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
index eebb3ae..754e280 100644
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -6,10 +6,6 @@ if XORG_BUS_PCI
PCI_SOURCES += Pci.c Pci.h
endif
-if XORG_BUS_BSDPCI
-PCI_SOURCES += bsd_pci.c
-endif
-
if XORG_BUS_SPARC
PLATFORM_SOURCES = Sbus.c
sdk_HEADERS += xf86Sbus.h
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 52d142f..6aaa700 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -129,12 +129,5 @@
Bool
xf86scanpci(void)
{
- Bool success = FALSE;
-
- success = (pci_system_init() == 0);
-
- /* choose correct platform/OS specific PCI init routine */
- osPciInit();
-
- return success;
+ return pci_system_init() == 0;
}
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 776bb63..f8855f6 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -135,14 +135,4 @@
#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
#define PCI_TAG_NO_DOMAIN(tag) ((tag) & 0x00ffff00u)
-#if defined(linux)
-#define osPciInit(x) do {} while (0)
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__OpenBSD__) || defined(__NetBSD__) || \
- defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
-extern void osPciInit(void);
-#else
-#error No PCI support available for this architecture/OS combination
-#endif
-
#endif /* _PCI_H */
diff --git a/hw/xfree86/os-support/bus/bsd_pci.c b/hw/xfree86/os-support/bus/bsd_pci.c
deleted file mode 100644
index 7a5dbbb..0000000
--- a/hw/xfree86/os-support/bus/bsd_pci.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * 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.
- *
- * Authors:
- * Eric Anholt <eric at anholt.net>
- *
- */
-
-/**
- * @file bsd_pci.c
- *
- * This is a trivial implementation of the remaining PCI support hooks in the
- * X Server that is unaware of domains.
- *
- * Most of even this should go away once drivers are converted and the
- * old interfaces are confirmed to all be obsolete.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <stdio.h>
-#include "compiler.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#include "Pci.h"
-
-#include "pciaccess.h"
-
-void
-osPciInit(void)
-{
- xf86InitVidMem();
-}
diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am
index 3866054..0962f04 100644
--- a/hw/xfree86/os-support/hurd/Makefile.am
+++ b/hw/xfree86/os-support/hurd/Makefile.am
@@ -4,7 +4,6 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c \
hurd_video.c \
$(srcdir)/../shared/VTsw_noop.c \
$(srcdir)/../shared/posix_tty.c \
- $(srcdir)/../shared/vidmem.c \
$(srcdir)/../shared/sigiostubs.c \
$(srcdir)/../shared/pm_noop.c \
$(srcdir)/../shared/kmod_noop.c \
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 1e7d604..4b6c931 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -37,7 +37,6 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
/**************************************************************************
* I/O Permissions section
@@ -76,9 +75,3 @@ xf86DisableIO()
ioperm(0, 0x10000, 0);
return;
}
-
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 50fcd1f..503f3f2 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -27,7 +27,6 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c \
lnx_agp.c lnx_kmod.c lnx_bell.c lnx_platform.c \
$(srcdir)/../shared/VTsw_usl.c \
$(srcdir)/../shared/posix_tty.c \
- $(srcdir)/../shared/vidmem.c \
$(srcdir)/../shared/sigio.c \
$(ACPI_SRCS) \
$(APM_SRCS) \
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index e1fa3f8..8a3467f 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -15,7 +15,6 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
#if defined(linux)
#include <asm/ioctl.h>
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index c09d719..423a99a 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -37,7 +37,6 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
static Bool ExtendedEnabled = FALSE;
@@ -66,16 +65,6 @@ extern int iopl(int __level);
#endif
/***************************************************************************/
-/* Video Memory Mapping section */
-/***************************************************************************/
-
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
-
-/***************************************************************************/
/* I/O Permissions section */
/***************************************************************************/
diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c
index da486c0..84ce62c 100644
--- a/hw/xfree86/os-support/shared/agp_noop.c
+++ b/hw/xfree86/os-support/shared/agp_noop.c
@@ -38,7 +38,6 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
Bool
xf86GARTCloseScreen(int screenNum)
diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c
deleted file mode 100644
index a6bf677..0000000
--- a/hw/xfree86/os-support/shared/vidmem.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1993-2003 by The XFree86 Project, Inc.
- *
- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "input.h"
-#include "scrnintstr.h"
-
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-
-/*
- * This file contains the common part of the video memory mapping functions
- */
-
-static VidMemInfo vidMemInfo = { FALSE, };
-
-void
-xf86InitVidMem(void)
-{
- if (!vidMemInfo.initialised) {
- memset(&vidMemInfo, 0, sizeof(VidMemInfo));
- xf86OSInitVidMem(&vidMemInfo);
- }
-}
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index 6cda4b3..7c295f6 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -22,7 +22,6 @@ libsolaris_la_SOURCES = sun_init.c \
$(srcdir)/../shared/kmod_noop.c \
$(srcdir)/../shared/posix_tty.c \
$(srcdir)/../shared/sigio.c \
- $(srcdir)/../shared/vidmem.c \
$(VTSW_SRC)
nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 25f7618..6710a54 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -56,20 +56,9 @@
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
#include <sys/mman.h>
/***************************************************************************/
-/* Video Memory Mapping section */
-/***************************************************************************/
-
-_X_HIDDEN void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
-}
-
-/***************************************************************************/
/* I/O Permissions section */
/***************************************************************************/
diff --git a/hw/xfree86/os-support/stub/Makefile.am b/hw/xfree86/os-support/stub/Makefile.am
index 19468c6..3337fe8 100644
--- a/hw/xfree86/os-support/stub/Makefile.am
+++ b/hw/xfree86/os-support/stub/Makefile.am
@@ -10,9 +10,7 @@ libstub_la_SOURCES = \
$(srcdir)/../shared/ioperm_noop.c \
$(srcdir)/../shared/kmod_noop.c \
$(srcdir)/../shared/pm_noop.c \
- $(srcdir)/../shared/vidmem.c \
$(srcdir)/../shared/posix_tty.c \
$(srcdir)/../shared/sigio.c \
stub_bell.c \
- stub_init.c \
- stub_video.c
+ stub_init.c
diff --git a/hw/xfree86/os-support/stub/stub_video.c b/hw/xfree86/os-support/stub/stub_video.c
deleted file mode 100644
index 9771fcf..0000000
--- a/hw/xfree86/os-support/stub/stub_video.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
- pVidMem->initialised = TRUE;
- return;
-}
diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h
deleted file mode 100644
index ce1ec33..0000000
--- a/hw/xfree86/os-support/xf86OSpriv.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1999-2000 by The XFree86 Project, Inc.
- *
- * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef _XF86OSPRIV_H
-#define _XF86OSPRIV_H
-
-typedef struct {
- Bool initialised;
-} VidMemInfo, *VidMemInfoPtr;
-
-void xf86OSInitVidMem(VidMemInfoPtr);
-
-#endif /* _XF86OSPRIV_H */
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 822bab2..350b11e 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -186,9 +186,6 @@ extern _X_EXPORT void xf86VTRequest(int sig);
extern _X_EXPORT int xf86ProcessArgument(int, char **, int);
extern _X_EXPORT void xf86UseMsg(void);
extern _X_EXPORT PMClose xf86OSPMOpen(void);
-
-extern _X_EXPORT void xf86InitVidMem(void);
-
#endif /* XF86_OS_PRIVS */
#ifdef XSERVER_PLATFORM_BUS
--
1.9.3
More information about the xorg-devel
mailing list