Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS.

6 files changed, 1 insertions, 116 deletions

diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
index 0432ba931..446b69ee2 100644
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/hw/xfree86/os-support/bsd/Makefile.am
@@ -57,7 +57,6 @@ libbsd_la_SOURCES = \
 	$(srcdir)/../shared/libc_wrapper.c \
 	$(srcdir)/../shared/posix_tty.c \
 	$(srcdir)/../shared/sigio.c \
-	$(srcdir)/../shared/stdPci.c \
 	$(srcdir)/../shared/vidmem.c \
 	bsd_VTsw.c \
 	bsd_init.c \
diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am
index 731ff083d..e6543e133 100644
--- a/hw/xfree86/os-support/hurd/Makefile.am
+++ b/hw/xfree86/os-support/hurd/Makefile.am
@@ -6,7 +6,6 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
 		$(srcdir)/../shared/posix_tty.c \
 		$(srcdir)/../shared/libc_wrapper.c \
 		$(srcdir)/../shared/stdResource.c \
-		$(srcdir)/../shared/stdPci.c \
 		$(srcdir)/../shared/sigiostubs.c \
 		$(srcdir)/../shared/pm_noop.c \
 		$(srcdir)/../shared/kmod_noop.c \
diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c
index 8415aa01c..53818f2dc 100644
--- a/hw/xfree86/os-support/linux/lnx_pci.c
+++ b/hw/xfree86/os-support/linux/lnx_pci.c
@@ -147,69 +147,6 @@ int lnxPciInit(void) {
     return xf86OSLinuxNumPciDevs;
 }
 
-Bool
-xf86GetPciSizeFromOS(PCITAG tag, int index, int* bits)
-{
-    signed PCIADDR_TYPE Size;
-    struct pci_dev *device;
-
-    if (index >= 7)
-        return FALSE;
-    
-    if (!xf86OSLinuxPCIDevs) {
-        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
-    }
-    if (!xf86OSLinuxPCIDevs)
-        return FALSE;
-    
-    for (device = xf86OSLinuxPCIDevs; device; device = device->next) {
-        if (tag == PCI_MAKE_TAG(PCI_MAKE_BUS(device->domain, device->bus),
-				device->dev, device->fn)) {
-            if (device->size[index] != 0) {
-                Size = device->size[index] - ((PCIADDR_TYPE) 1);
-                while (Size & ((PCIADDR_TYPE) 0x01)) {
-                    Size = Size >> ((PCIADDR_TYPE) 1);
-                    (*bits)++;
-                }
-            }
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-
-
-#if 0
-/* Query the kvirt address (64bit) of a BAR range from TAG */
-Bool
-xf86GetPciOffsetFromOS(PCITAG tag, int index, unsigned long* bases)
-{
-    struct pci_dev *device;
-
-    if (index >= 7)
-        return FALSE;
-
-    if (!xf86OSLinuxPCIDevs) {
-        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
-    }
-    if (!xf86OSLinuxPCIDevs)
-        return FALSE;
-
-    for (device = xf86OSLinuxPCIDevs; device; device = device->next) {
-        if (tag == PCI_MAKE_TAG(PCI_MAKE_BUS(device->domain, device->bus),
-				device->dev, device->fn)) {
-            /* return the offset for the index requested */
-            *bases = device->offset[index];
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-#endif
-
 /* Query the kvirt address (64bit) of a BAR range from size for a given TAG */
 unsigned long
 xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base)
diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c
deleted file mode 100644
index 6777c6a1f..000000000
--- a/hw/xfree86/os-support/shared/stdPci.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1999-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 "xf86.h"
-#include "xf86Priv.h"
-#include "xf86Privstr.h"
-#include "xf86Pci.h"
-#define NEED_OS_RAC_PROTOS
-#include "xf86_OSlib.h"
-
-#ifndef HAVE_PCI_SIZE_FUNC
-#define xf86StdGetPciSizeFromOS xf86GetPciSizeFromOS
-#endif
-
-Bool
-xf86StdGetPciSizeFromOS(PCITAG tag, int index, int* bits)
-{
-    return FALSE;
-}
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index c027d9a3e..5ed60bc55 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -23,7 +23,7 @@ libsolaris_la_SOURCES = sun_bios.c sun_init.c \
 	$(srcdir)/../shared/libc_wrapper.c \
 	$(srcdir)/../shared/kmod_noop.c \
 	$(srcdir)/../shared/posix_tty.c $(srcdir)/../shared/sigiostubs.c \
-	$(srcdir)/../shared/stdPci.c $(srcdir)/../shared/stdResource.c \
+	$(srcdir)/../shared/stdResource.c \
 	$(VTSW_SRC)
 nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
 
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 1d6b842fe..abf5a47c2 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -234,8 +234,6 @@ resPtr xf86StdAccResFromOS(resPtr ret);
 resPtr xf86AccResFromOS(resPtr ret);
 #endif /* NEED_OS_RAC_PROTOS */
 
-extern Bool xf86GetPciSizeFromOS(PCITAG tag, int indx, int* bits);
-extern Bool xf86GetPciOffsetFromOS(PCITAG tag, int indx, unsigned long* bases);
 extern unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base);
 
 extern void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer);