No more "-scanpci" given that we already have it in libpciaccess.
(Yeah, lets nuke dead code!)
This commit is contained in:
parent
f19f7b8e53
commit
9727db88d5
|
@ -31,7 +31,7 @@ BUILT_SOURCES = xf86DefModeSet.c
|
||||||
AM_LDFLAGS = -r
|
AM_LDFLAGS = -r
|
||||||
libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
|
libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
|
||||||
xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
|
xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
|
||||||
xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
|
xf86DoProbe.c xf86Events.c \
|
||||||
xf86Globals.c xf86AutoConfig.c \
|
xf86Globals.c xf86AutoConfig.c \
|
||||||
xf86MiscExt.c xf86Option.c \
|
xf86MiscExt.c xf86Option.c \
|
||||||
xf86VidMode.c xf86fbman.c xf86cmap.c \
|
xf86VidMode.c xf86fbman.c xf86cmap.c \
|
||||||
|
|
|
@ -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);
|
|
||||||
}
|
|
|
@ -1668,10 +1668,6 @@ ddxProcessArgument(int argc, char **argv, int i)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (!strcmp(argv[i], "-scanpci"))
|
|
||||||
{
|
|
||||||
DoScanPci(argc, argv, i);
|
|
||||||
}
|
|
||||||
if (!strcmp(argv[i], "-probe"))
|
if (!strcmp(argv[i], "-probe"))
|
||||||
{
|
{
|
||||||
xf86DoProbe = TRUE;
|
xf86DoProbe = TRUE;
|
||||||
|
@ -1734,7 +1730,6 @@ ddxUseMsg()
|
||||||
ErrorF("-config file specify a configuration file, relative to the\n");
|
ErrorF("-config file specify a configuration file, relative to the\n");
|
||||||
ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n");
|
ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n");
|
||||||
ErrorF("-probeonly probe for devices, then exit\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("-verbose [n] verbose startup messages\n");
|
||||||
ErrorF("-logverbose [n] verbose log messages\n");
|
ErrorF("-logverbose [n] verbose log messages\n");
|
||||||
ErrorF("-quiet minimal startup messages\n");
|
ErrorF("-quiet minimal startup messages\n");
|
||||||
|
|
|
@ -40,9 +40,8 @@
|
||||||
* or for non-video devices unless they're needed by a driver or elsewhere.
|
* 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
|
* A comprehensive set of PCI vendor, device and subsystem data is
|
||||||
* auto-generated from the ../etc/pci.ids file using the pciids2c.pl script,
|
* 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
|
* and is used in scanpci utility. Don't modify the pci.ids file. If
|
||||||
* modify the pci.ids file. If new/corrected entries are required, add them
|
* new/corrected entries are required, add them to ../etc/extrapci.ids.
|
||||||
* to ../etc/extrapci.ids.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _XF86_PCIINFO_H
|
#ifndef _XF86_PCIINFO_H
|
||||||
|
|
|
@ -155,10 +155,6 @@ Bool xf86PathIsSafe(const char *path);
|
||||||
|
|
||||||
extern DisplayModeRec xf86DefaultModes [];
|
extern DisplayModeRec xf86DefaultModes [];
|
||||||
|
|
||||||
/* xf86DoScanPci.c */
|
|
||||||
|
|
||||||
void DoScanPci(int argc, char **argv, int i);
|
|
||||||
|
|
||||||
/* xf86DoProbe.c */
|
/* xf86DoProbe.c */
|
||||||
void DoProbe(void);
|
void DoProbe(void);
|
||||||
void DoConfigure(void);
|
void DoConfigure(void);
|
||||||
|
|
|
@ -75,7 +75,6 @@ rendition
|
||||||
s3
|
s3
|
||||||
s3virge
|
s3virge
|
||||||
savage
|
savage
|
||||||
scanpci
|
|
||||||
shadow
|
shadow
|
||||||
shadowfb
|
shadowfb
|
||||||
siliconmotion
|
siliconmotion
|
||||||
|
|
|
@ -378,13 +378,6 @@ and
|
||||||
.B \-ggamma
|
.B \-ggamma
|
||||||
options.
|
options.
|
||||||
.TP 8
|
.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"
|
.BI \-screen " screen-name"
|
||||||
Use the __xconfigfile__(__filemansuffix__) file
|
Use the __xconfigfile__(__filemansuffix__) file
|
||||||
.B Screen
|
.B Screen
|
||||||
|
|
|
@ -994,10 +994,8 @@ In multi-head configurations, or when using a secondary graphics card in a
|
||||||
single-head configuration, this entry is mandatory.
|
single-head configuration, this entry is mandatory.
|
||||||
Its main purpose is to make an unambiguous connection between the device
|
Its main purpose is to make an unambiguous connection between the device
|
||||||
section and the hardware it is representing.
|
section and the hardware it is representing.
|
||||||
This information can usually be found by running the __xservername__ server
|
This information can usually be found by running the pciaccess tool
|
||||||
with the
|
scanpci.
|
||||||
.B \-scanpci
|
|
||||||
command line option.
|
|
||||||
.TP 7
|
.TP 7
|
||||||
.BI "Screen " number
|
.BI "Screen " number
|
||||||
This option is mandatory for cards where a single PCI entity can drive more
|
This option is mandatory for cards where a single PCI entity can drive more
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# libdummy.a contains just those bits used in the server itself
|
# libdummy.a contains just those bits used in the server itself
|
||||||
# libdummy-nonserver.a contains additional routines normally found in the
|
# 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
|
noinst_LIBRARIES = libdummy-nonserver.a
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ libxf86modes_a_SOURCES = \
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
|
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
|
||||||
-I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
|
-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)/../vgahw -I$(srcdir)/../ramdac \
|
||||||
-I$(srcdir)/../dixmods/extmod
|
-I$(srcdir)/../dixmods/extmod
|
||||||
|
|
||||||
|
|
|
@ -253,8 +253,6 @@ xglxArgRec xorgUidArgs[] = {
|
||||||
xglxArgRec xorgArgs[] = {
|
xglxArgRec xorgArgs[] = {
|
||||||
ARG (xglxProcessXorgWaitExitArgument, "-probeonly",
|
ARG (xglxProcessXorgWaitExitArgument, "-probeonly",
|
||||||
" probe for devices, then exit"),
|
" probe for devices, then exit"),
|
||||||
ARG (xglxProcessXorgWaitExitArgument, "-scanpci",
|
|
||||||
" execute the scanpci module and exit"),
|
|
||||||
XORG_UARG ("-verbose", " [n] verbose startup messages", 2),
|
XORG_UARG ("-verbose", " [n] verbose startup messages", 2),
|
||||||
XORG_UARG ("-logverbose", " [n] verbose log messages", 2),
|
XORG_UARG ("-logverbose", " [n] verbose log messages", 2),
|
||||||
XORG_UARG ("-quiet", " minimal startup messages", 1),
|
XORG_UARG ("-quiet", " minimal startup messages", 1),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user