No more "-scanpci" given that we already have it in libpciaccess.

(Yeah, lets nuke dead code!)

10 files changed, 7 insertions, 174 deletions

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index c060b73f0..4f0a2d6b3 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -31,7 +31,7 @@ BUILT_SOURCES = xf86DefModeSet.c
 AM_LDFLAGS = -r
 libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                       xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
-                      xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
+                      xf86DoProbe.c xf86Events.c \
                       xf86Globals.c xf86AutoConfig.c \
                       xf86MiscExt.c xf86Option.c \
                       xf86VidMode.c xf86fbman.c xf86cmap.c \
diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c
deleted file mode 100644
index 51892f041..000000000
--- a/hw/xfree86/common/xf86DoScanPci.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 1999-2002 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).
- */
-
-/*
- * Finish setting up the server.
- * Call the functions from the scanpci module.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <pciaccess.h>
-#include "os.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86Pci.h"
-#include "Pci.h"
-#include "xf86_OSproc.h"
-
-static void ScanPciDisplayPCICardInfo(void);
-
-void
-ScanPciDisplayPCICardInfo(void)
-{
-    struct pci_id_match   match;
-    struct pci_device_iterator *iter;
-    const struct pci_device *dev;
-
-    xf86EnableIO();
-
-    if (! xf86scanpci()) {
-        xf86MsgVerb(X_NONE, 0, "No PCI info available\n");
-	return;
-    }
-    xf86MsgVerb(X_NONE, 0,
-		"Probing for PCI devices (Bus:Device:Function)\n\n");
-
-    iter = pci_id_match_iterator_create(NULL);
-    while ((dev = pci_device_next(iter)) != NULL) {
-	const char *svendorname = NULL, *subsysname = NULL;
-	const char *vendorname = NULL, *devicename = NULL;
-
-
-	xf86MsgVerb(X_NONE, 0, "(%d:%d:%d) ",
-		    PCI_MAKE_BUS(dev->domain, dev->bus), dev->dev, dev->func);
-
-	/*
-	 * Lookup as much as we can about the device.
-	 */
-	match.vendor_id = dev->vendor_id;
-	match.device_id = dev->device_id;
-	match.subvendor_id = (dev->subvendor_id != 0)
-	  ? dev->subvendor_id : PCI_MATCH_ANY;
-	match.subdevice_id = (dev->subdevice_id != 0)
-	  ? dev->subdevice_id : PCI_MATCH_ANY;
-	match.device_class = 0;
-	match.device_class_mask = 0;
-
-	pci_get_strings(& match, & vendorname, & devicename,
-			& svendorname, & subsysname);
-
-	if ((dev->subvendor_id != 0) || (dev->subdevice_id != 0)) {
-	    xf86MsgVerb(X_NONE, 0, "%s %s (0x%04x / 0x%04x) using ",
-			(svendorname == NULL) ? "unknown vendor" : svendorname,
-			(subsysname == NULL) ? "unknown card" : subsysname,
-			dev->subvendor_id, dev->subdevice_id);
-	}
-
-	xf86MsgVerb(X_NONE, 0, "%s %s (0x%04x / 0x%04x)\n",
-		    (vendorname == NULL) ? "unknown vendor" : vendorname,
-		    (devicename == NULL) ? "unknown chip" : devicename,
-		    dev->vendor_id, dev->device_id);
-    }
-
-    pci_iterator_destroy(iter);
-}
-
-
-void DoScanPci(int argc, char **argv, int i)
-{
-  int j,skip,globalVerbose;
-
-  /*
-   * first we need to finish setup of the OS so that we can call other
-   * functions in the server
-   */
-  OsInit();
-
-  /*
-   * The old verbosity processing that was here isn't useful anymore, but
-   * for compatibility purposes, ignore verbosity changes after the -scanpci
-   * flag.
-   */
-  globalVerbose = xf86Verbose;
-
-  /*
-   * next we process the arguments that are remaining on the command line,
-   * so that things like the module path can be set there
-   */
-  for ( j = i+1; j < argc; j++ ) {
-    if ((skip = ddxProcessArgument(argc, argv, j)))
-	j += (skip - 1);
-  } 
-
-  /*
-   * Was the verbosity level increased?  If so, set it back.
-   */
-  if (xf86Verbose > globalVerbose)
-    xf86SetVerbosity(globalVerbose);
-
-  ScanPciDisplayPCICardInfo();
-
-  /*
-   * That's it; we really should clean things up, but a simple
-   * exit seems to be all we need.
-   */
-  exit(0);
-}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 41cf1d17c..7121b027b 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1668,10 +1668,6 @@ ddxProcessArgument(int argc, char **argv, int i)
     return 1;
   }
 #endif
-  if (!strcmp(argv[i], "-scanpci"))
-  {
-    DoScanPci(argc, argv, i);
-  }
   if (!strcmp(argv[i], "-probe"))
   {
     xf86DoProbe = TRUE;
@@ -1734,7 +1730,6 @@ ddxUseMsg()
   ErrorF("-config file           specify a configuration file, relative to the\n");
   ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");
   ErrorF("-probeonly             probe for devices, then exit\n");
-  ErrorF("-scanpci               execute the scanpci module and exit\n");
   ErrorF("-verbose [n]           verbose startup messages\n");
   ErrorF("-logverbose [n]        verbose log messages\n");
   ErrorF("-quiet                 minimal startup messages\n");
diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h
index 0630cfa82..356c7db4d 100644
--- a/hw/xfree86/common/xf86PciInfo.h
+++ b/hw/xfree86/common/xf86PciInfo.h
@@ -40,9 +40,8 @@
  * or for non-video devices unless they're needed by a driver or elsewhere.
  * A comprehensive set of PCI vendor, device and subsystem data is
  * auto-generated from the ../etc/pci.ids file using the pciids2c.pl script,
- * and is used in both the scanpci module and the scanpci utility.  Don't
- * modify the pci.ids file.  If new/corrected entries are required, add them
- * to ../etc/extrapci.ids.
+ * and is used in scanpci utility.  Don't modify the pci.ids file.  If 
+ * new/corrected entries are required, add them to ../etc/extrapci.ids.
  */
 
 #ifndef _XF86_PCIINFO_H
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 32801cb3f..fb9ecaea8 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -155,10 +155,6 @@ Bool xf86PathIsSafe(const char *path);
 
 extern DisplayModeRec xf86DefaultModes [];
 
-/* xf86DoScanPci.c */
-
-void DoScanPci(int argc, char **argv, int i);
-
 /* xf86DoProbe.c */
 void DoProbe(void);
 void DoConfigure(void);
diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry
index d76622157..1fec230e8 100644
--- a/hw/xfree86/doc/devel/Registry
+++ b/hw/xfree86/doc/devel/Registry
@@ -75,7 +75,6 @@ rendition
 s3
 s3virge
 savage
-scanpci
 shadow
 shadowfb
 siliconmotion
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index c950e326b..405efda55 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -378,13 +378,6 @@ and
 .B \-ggamma
 options.
 .TP 8
-.B \-scanpci
-When this option is specified, the
-.B __xservername__
-server scans the PCI bus, and prints out some information about each
-device that was detected.  See also scanpci(__appmansuffix__) 
-and pcitweak(__appmansuffix__).
-.TP 8
 .BI \-screen " screen-name"
 Use the __xconfigfile__(__filemansuffix__) file
 .B Screen
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 96f30c4bd..9f3980879 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -994,10 +994,8 @@ In multi-head configurations, or when using a secondary graphics card in a
 single-head configuration, this entry is mandatory.
 Its main purpose is to make an unambiguous connection between the device
 section and the hardware it is representing.
-This information can usually be found by running the __xservername__ server
-with the
-.B \-scanpci
-command line option.
+This information can usually be found by running the pciaccess tool
+scanpci.
 .TP 7
 .BI "Screen  " number
 This option is mandatory for cards where a single PCI entity can drive more
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index ad3f1ea12..85a1d03dd 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -1,6 +1,6 @@
 # libdummy.a contains just those bits used in the server itself
 # libdummy-nonserver.a contains additional routines normally found in the
-# server for use in building the utilities like scanpci & the config tools
+# server for use in building the utilities like config tools
 
 noinst_LIBRARIES = libdummy-nonserver.a
 
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 1f82068b3..6ee85757a 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -16,7 +16,7 @@ libxf86modes_a_SOURCES = \
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
-           -I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
+	   -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
 	   -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
 	   -I$(srcdir)/../dixmods/extmod