From f17b962bcdb8c6813b2c7fe8bb761aec186a81ef Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 27 Dec 1997 11:57:11 +0000 Subject: [PATCH] - Minor tweaks for first publicly distributed beta-version. - New PCI ID database entries from 2.1.76. - IRQ's are shown as hexadecimal numbers on the Ultra. - Disabled I/O and memory regions are not shown at all (they usually contain garbage). --- Makefile | 20 ++++++++++++-------- README | 2 -- lspci.c | 28 ++++++++++++++++++---------- pci.ids | 27 +++++++++++++++++++++++---- pciutils.lsm | 15 +++++++++++++++ 5 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 pciutils.lsm diff --git a/Makefile b/Makefile index 3960efb..40a4379 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,11 @@ -# $Id: Makefile,v 1.1 1997/12/23 10:29:18 mj Exp $ +# $Id: Makefile,v 1.2 1997/12/27 11:57:11 mj Exp $ # Makefile for Linux PCI Utilities # (c) 1997 Martin Mares -OPT=-O2 -m486 -malign-loops=0 -malign-jumps=0 -malign-functions=2 -fno-strength-reduce -#-fomit-frame-pointer -#LOPT=-s -#DEBUG=-ggdb -#LDEBUG=-lefence -CFLAGS=$(OPT) $(DEBUG) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wno-unused -Werror -LDFLAGS=$(LOPT) $(LDEBUG) +OPT=-O2 -fomit-frame-pointer +CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wno-unused -Werror + +PREFIX=/ all: lspci @@ -20,3 +17,10 @@ names.o: names.c pciutils.h clean: rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core` rm -f lspci + +install: all + install -o root -g root -m 755 -s lspci $(PREFIX)/sbin + install -o root -g root -m 644 pci.ids $(PREFIX)/etc + +dist: clean + sh -c 'X=`pwd` ; X=`basename $$X` ; cd .. ; tar czvvf /tmp/$$X.tar.gz $$X' diff --git a/README b/README index 6de00d5..8316678 100644 --- a/README +++ b/README @@ -1,4 +1,2 @@ This is an experimental version of the Linux PCI Utilities package. Maintained by Martin Mares - -pci.ids should be copied to /etc if you want textual PCI ID's. diff --git a/lspci.c b/lspci.c index 704d8ba..51c46ff 100644 --- a/lspci.c +++ b/lspci.c @@ -1,5 +1,5 @@ /* - * $Id: lspci.c,v 1.2 1997/12/23 17:12:02 mj Exp $ + * $Id: lspci.c,v 1.3 1997/12/27 11:57:12 mj Exp $ * * Linux PCI Utilities -- List All PCI Devices * @@ -42,6 +42,14 @@ Usage: lspci []\n\ -t\tShow bus tree\n\ "; +/* Format strings used for IRQ numbers */ + +#ifdef __sparc_v9__ +#define IRQ_FORMAT "%08x" +#else +#define IRQ_FORMAT "%d" +#endif + /* Our view of the PCI bus */ struct device { @@ -270,10 +278,11 @@ show_bases(struct device *d, int cnt) else putchar('\t'); if (flg & PCI_BASE_ADDRESS_SPACE_IO) - printf("I/O ports at %04lx%s\n", - pos & PCI_BASE_ADDRESS_IO_MASK, - (cmd & PCI_COMMAND_IO) ? "" : " [disabled]"); - else + { + if (cmd & PCI_COMMAND_IO) + printf("I/O ports at %04lx\n", pos & PCI_BASE_ADDRESS_IO_MASK); + } + else if (cmd & PCI_COMMAND_MEMORY) { int t = flg & PCI_BASE_ADDRESS_MEM_TYPE_MASK; printf("Memory at "); @@ -288,13 +297,12 @@ show_bases(struct device *d, int cnt) else printf("????????"); } - printf("%08lx (%s, %sprefetchable)%s\n", + printf("%08lx (%s, %sprefetchable)\n", pos & PCI_BASE_ADDRESS_MEM_MASK, (t == PCI_BASE_ADDRESS_MEM_TYPE_32) ? "32-bit" : (t == PCI_BASE_ADDRESS_MEM_TYPE_64) ? "64-bit" : (t == PCI_BASE_ADDRESS_MEM_TYPE_1M) ? "low-1M 32-bit" : "???", - (flg & PCI_BASE_ADDRESS_MEM_PREFETCH) ? "" : "non-", - (cmd & PCI_COMMAND_MEMORY) ? "" : " [disabled]"); + (flg & PCI_BASE_ADDRESS_MEM_PREFETCH) ? "" : "non-"); } } } @@ -495,7 +503,7 @@ show_verbose(struct device *d) putchar('\n'); } if (int_pin) - printf("\tInterrupt: pin %c routed to IRQ %d\n", 'A' + int_pin - 1, irq); + printf("\tInterrupt: pin %c routed to IRQ " IRQ_FORMAT "\n", 'A' + int_pin - 1, irq); } else { @@ -520,7 +528,7 @@ show_verbose(struct device *d) printf(", latency %d", latency); if (int_pin) if (d->kernel_irq) - printf(", IRQ %d", irq); + printf(", IRQ " IRQ_FORMAT, irq); else printf(", IRQ ?"); putchar('\n'); diff --git a/pci.ids b/pci.ids index b73a7b2..aaca4ea 100644 --- a/pci.ids +++ b/pci.ids @@ -4,7 +4,7 @@ # Maintained by Martin Mares # If you have any new entries, send them to the maintainer. # -# $Id: pci.ids,v 1.1 1997/12/23 10:29:18 mj Exp $ +# $Id: pci.ids,v 1.2 1997/12/27 11:57:13 mj Exp $ # # Vendors and devices. Please keep sorted. @@ -30,12 +30,13 @@ 000c 53c895 000d 53c885 000f 53c875 - 008f 53c876 + 008f 53c875J 1002 ATI 4158 68800AX 4354 215CT222 4358 210888CX 4742 Mach64 GB + 4744 Mach64 GD (Rage Pro) 4750 Mach64 GP (Rage Pro) 4754 Mach64 GT (Rage II) 4755 Mach64 GT (Rage II) @@ -102,7 +103,7 @@ 1023 Trident 9420 TG 9420 9440 TG 9440 - 9660 TG 9660 + 9660 TG 9660 / Cyber9385 9750 Image 975 1025 Acer Incorporated 1435 M1435 @@ -203,6 +204,15 @@ 1077 Q Logic 1020 ISP1020 1022 ISP1022 +1078 Cyrix + 0000 5510 + 0001 PCI Master + 0002 5520 + 0100 5530 Kahlua Legacy + 0101 5530 Kahlua SMI + 0102 5530 Kahlua IDE + 0103 5530 Kahlua Audio + 0104 5530 Kahlua Video 107d Leadtek Research 0000 S3 805 1080 Contaq @@ -287,7 +297,8 @@ 0000 CA91C042 Universe 10e8 AMCC 8043 Myrinet PCI (M2-PCI-32) - 807d S5933 + 807d S5933 PCI44 + 809c S5933 Traquair HEPC3 10ea Intergraphics 1680 IGA-1680 1682 IGA-1682 @@ -369,6 +380,7 @@ 0001 MV-1000 1163 Rendition 0001 Verite 1000 + 2000 Verite 2100 1179 Toshiba 0601 Laptop 1180 Ricoh @@ -410,6 +422,10 @@ 0001 Voodoo 1236 Sigma Designs 6401 REALmagic64/GX +124d Stallion + 0000 EasyConnection 8/32 + 0002 EasyConnection 8/64 + 0003 EasyIO 1255 Optibase 1110 MPEG Forge 1210 MPEG Fusion @@ -454,6 +470,9 @@ 8902 PLATO/PX (graphics) 8a01 ViRGE/DX or /GX 8a10 ViRGE/GX2 + 8c01 ViRGE/MX + 8c02 ViRGE/MX+ + 8c03 ViRGE/MX+MV 8086 Intel 0482 82375EB 0483 82424ZX Saturn diff --git a/pciutils.lsm b/pciutils.lsm new file mode 100644 index 0000000..7d8e611 --- /dev/null +++ b/pciutils.lsm @@ -0,0 +1,15 @@ +Begin3 +Title: Linux PCI Utilities +Version: 0.9 +Entered-date: 971227 +Description: This package contains various utilities for inspecting and + setting of devices connected to the PCI bus. Requires + kernel version 2.1.77 or newer (supporting the /proc/bus/pci + interface). +Keywords: kernel, pci, proc, lspci +Author: mj@atrey.karlin.mff.cuni.cz (Martin Mares) +Maintained-by: mj@atrey.karlin.mff.cuni.cz (Martin Mares) +Primary-site: atrey.karlin.mff.cuni.cz pub/local/mj/pciutils-0.9.tar.gz +Alternate-site: sunsite.unc.edu pub/Linux/system/??? +Copying-policy: GPL +End -- 2.39.2