diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
| commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
| tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /hw/xfree86/utils/scanpci | |
| parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'hw/xfree86/utils/scanpci')
| -rw-r--r-- | hw/xfree86/utils/scanpci/scanpci.c | 29 | ||||
| -rw-r--r-- | hw/xfree86/utils/scanpci/scanpci.man.pre | 2 |
2 files changed, 7 insertions, 24 deletions
diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index 670f2b442..5746269f5 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -23,14 +23,14 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.93 2004/03/05 16:03:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ #include "X.h" #include "os.h" #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSproc.h" -#include "Pci.h" +#include "xf86Pci.h" #include "xf86PciInfo.h" #include "xf86ScanPci.h" #include "dummylib.h" @@ -148,7 +148,7 @@ usage(void) int main(int argc, char *argv[]) { - pciConfigPtr pPCI, *pcrpp = NULL; + pciConfigPtr *pcrpp = NULL; int Verbose = 0; int i = 0; int force = 0; @@ -159,7 +159,7 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, "?v12OfV:")) != -1) switch(c) { case 'v': - Verbose++; + Verbose = 1; break; case '1': xf86Info.pciFlags = PCIProbe1; @@ -204,25 +204,8 @@ main(int argc, char *argv[]) exit (1); } - while ((pPCI = pcrpp[i++])) - identify_card(pPCI, Verbose); - - if (Verbose > 1) { - printf("\nPCI bus linkages:\n\n"); - - for (i = 0; i < MAX_PCI_BUSES; i++) { - pciBusInfo_t *pBusInfo; - - if (!(pBusInfo = pciBusInfo[i])) - continue; - - if ((pPCI = pBusInfo->bridge)) - printf("PCI bus 0x%04x has parent bridge 0x%04x:0x%02x:0x%1x\n", - i, pPCI->busnum, pPCI->devnum, pPCI->funcnum); - else - printf("PCI bus 0x%04x has no parent\n", i); - } - } + while (pcrpp[i]) + identify_card(pcrpp[i++],Verbose); xf86DisableIO(); exit(0); diff --git a/hw/xfree86/utils/scanpci/scanpci.man.pre b/hw/xfree86/utils/scanpci/scanpci.man.pre index baf231603..2c9bcc964 100644 --- a/hw/xfree86/utils/scanpci/scanpci.man.pre +++ b/hw/xfree86/utils/scanpci/scanpci.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.2 2000/12/11 20:18:45 dawes Exp $ .TH SCANPCI 1 __vendorversion__ .SH NAME scanpci - scan/probe PCI buses |