First released version of pciutils.

	- New options for overriding names of /proc/bus/pci and /etc/pci.ids.

	- Added verbose tree mode.

	- Included new pci.ids, now maintained by Jens Maurer.

	- Removed some debugging hacks.

diff --git a/Makefile b/Makefile
index c7abd0b16b822d7b7b89621152383445d52cf11c..c1e45b15c9c796a8620e65d993cfd7aac744b83a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/27 12:01:34 mj Exp $
+# $Id: Makefile,v 1.4 1998/01/27 11:50:07 mj Exp $
 # Makefile for Linux PCI Utilities
 # (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 
@@ -23,4 +23,4 @@ install: all
        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 --exclude CVS'
+       sh -c 'X=`pwd` ; X=`basename $$X` ; cd .. ; tar czvvf /tmp/$$X.tar.gz $$X --exclude CVS --exclude tmp'

diff --git a/lspci.c b/lspci.c
index b1f1d9bcc0f9aed44e61f8a51c94c80bca3044b5..29d5f192e83bf00ec3205377a321c9bddb4c3b01 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -1,9 +1,9 @@
 /*
- *     $Id: lspci.c,v 1.4 1998/01/01 19:36:23 mj Exp $
+ *     $Id: lspci.c,v 1.5 1998/01/27 11:50:08 mj Exp $
  *
  *     Linux PCI Utilities -- List All PCI Devices
  *
- *     Copyright (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997, 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -28,8 +28,9 @@ static int func_filter = -1;
 static int vend_filter = -1;
 static int dev_filter = -1;
 static int show_tree;                  /* Show bus tree */
+static char *pci_dir = PROC_BUS_PCI;
 
-static char options[] = "nvbxB:S:F:V:D:t";
+static char options[] = "nvbxB:S:F:V:D:ti:p:";
 
 static char help_msg[] = "\
 Usage: lspci [<switches>]\n\
@@ -40,6 +41,8 @@ Usage: lspci [<switches>]\n\
 -x\tShow hex-dump of config space (-xx shows full 256 bytes)\n\
 -B <bus>, -S <slot>, -F <func>, -V <vendor>, -D <device>  Show only selected devices\n\
 -t\tShow bus tree\n\
+-i <file>\tUse specified ID database instead of " ETC_PCI_IDS "\n\
+-p <dir>\tUse specified bus directory instead of " PROC_BUS_PCI "\n\
 ";
 
 /* Format strings used for IRQ numbers */
@@ -96,10 +99,12 @@ scan_dev_list(void)
 {
   FILE *f;
   byte line[256];
+  byte name[256];
 
-  if (! (f = fopen(PROC_BUS_PCI "/devices", "r")))
+  sprintf(name, "%s/devices", pci_dir);
+  if (! (f = fopen(name, "r")))
     {
-      perror("Unable to open " PROC_BUS_PCI "/devices");
+      perror(name);
       exit(1);
     }
   while (fgets(line, sizeof(line), f))
@@ -134,8 +139,8 @@ scan_dev_list(void)
 static inline void
 make_proc_pci_name(struct device *d, char *p)
 {
-  sprintf(p, PROC_BUS_PCI "/%02x/%02x.%x",
-         d->bus, PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
+  sprintf(p, "%s/%02x/%02x.%x",
+         pci_dir, d->bus, PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
 }
 
 static void
@@ -745,6 +750,8 @@ show_tree_dev(struct device *d, byte *line, byte *p)
         show_tree_bridge(b, line, p);
         return;
       }
+  if (verbose)
+    p += sprintf(p, "  %s", lookup_device_full(d->vendid, d->devid));
   print_it(line, p);
 }
 
@@ -850,6 +857,12 @@ main(int argc, char **argv)
       case 't':
        show_tree++;
        break;
+      case 'i':
+       pci_ids = optarg;
+       break;
+      case 'p':
+       pci_dir = optarg;
+       break;
       default:
       bad:
        fprintf(stderr, help_msg);

diff --git a/names.c b/names.c
index 5c2ba8c4cabd90a5725e1a10e195c02709999230..9ea00ada7fb0adccb95c4e38fe8ed92dd2be3882 100644 (file)
--- a/names.c
+++ b/names.c
@@ -1,9 +1,9 @@
 /*
- *     $Id: names.c,v 1.2 1997/12/27 18:38:30 mj Exp $
+ *     $Id: names.c,v 1.3 1998/01/27 11:50:10 mj Exp $
  *
  *     Linux PCI Utilities -- Device ID to Name Translation
  *
- *     Copyright (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997, 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -20,6 +20,8 @@
 
 int show_numeric_ids;
 
+char *pci_ids = ETC_PCI_IDS;
+
 static byte *name_list;
 static int name_list_loaded;
 
@@ -78,7 +80,7 @@ static int nl_add(int id1, int id2, byte *text)
 static void
 err_name_list(char *msg)
 {
-  fprintf(stderr, ETC_PCI_IDS ": %s: %m\n", msg);
+  fprintf(stderr, "%s: %s: %m\n", pci_ids, msg);
   exit(1);
 }
 
@@ -159,14 +161,14 @@ parse_name_list(void)
        goto parserr;
       if (nl_add(i, j, q))
        {
-         fprintf(stderr, ETC_PCI_IDS ", line %d: duplicate entry\n", lino);
+         fprintf(stderr, "%s, line %d: duplicate entry\n", pci_ids, lino);
          exit(1);
        }
     }
   return;
 
 parserr:
-  fprintf(stderr, ETC_PCI_IDS ", line %d: parse error\n", lino);
+  fprintf(stderr, "%s, line %d: parse error\n", pci_ids, lino);
   exit(1);
 }
 
@@ -176,7 +178,7 @@ load_name_list(void)
   int fd;
   struct stat st;
 
-  fd = open(ETC_PCI_IDS, O_RDONLY);
+  fd = open(pci_ids, O_RDONLY);
   if (fd < 0)
     {
       show_numeric_ids = 1;

diff --git a/pci.ids b/pci.ids
index aaca4eab9675fbd3ca48fc692aa000847d9bec96..8bea04ab636b0249d2b67d06fd6815e508bed322 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -1,265 +1,476 @@
 #
 #      List of PCI ID's
 #
-#      Maintained by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+#      Maintained by Jens Maurer <jmaurer@cck.uni-kl.de>
 #      If you have any new entries, send them to the maintainer.
 #
-#      $Id: pci.ids,v 1.2 1997/12/27 11:57:13 mj Exp $
+#      $Id: pci.ids,v 1.3 1998/01/27 11:50:11 mj Exp $
 #
 
 # Vendors and devices. Please keep sorted.
 
-0e11  Compaq
+003d  Lockheed Martin
+0e11  Compaq Computer Corporation
+       3032  QVision 1280P
        3033  QVision 1280/p
+       3034  QVision2
+       4000  4000 [TriFlex]
        ae10  Smart-2/P RAID Controller
        ae32  Netelligent 10/100
        ae34  Netelligent 10
-       ae35  NetFlex 3
+       ae35  Integrated NetFlex-3/P
        ae40  Netelligent 10/100 Dual
-       ae43  Netelligent 10/100 ProLiant
-       b011  Netelligent 10/100 Integrated
-       f130  ThunderLAN
-       f150  NetFlex 3 BNC
-1000  NCR
+       ae43  ProLiant Integrated Netelligent 10/100
+       b011  Integrated Netelligent 10/100
+       f130  NetFlex-3/P TLAN 1.0
+       f150  NetFlex-3/P TLAN 2.3
+1000  Symbios Logic Inc. (formerly NCR)
        0001  53c810
        0002  53c820
        0003  53c825
        0004  53c815
+       0005  53c810AP
        0006  53c860
        000b  53c896
        000c  53c895
        000d  53c885
        000f  53c875
        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)
-       4758  210888GX
-       5654  Mach64 VT
-1004  VLSI
+1002  ATI Technologies Inc
+       4158  68800AX [Mach32]
+       4354  215CT222 [Mach64 CT]
+       4358  210888CX [Mach64 CX]
+       4554  210888ET [Mach64 ET]
+       4742  215GB [Mach64 GB]
+       4744  215GD [Mach64 GD]
+       4749  215GI [Mach64 GI]
+       4750  264GP [Mach64 GP]
+       4754  215GT [Mach64 GT]
+       4755  215GTB [Mach64 GT]
+       4758  210888GX [Mach64 GX]
+       5654  264VT [Mach64 VT]
+       5c54  264LT [Mach64 LT]
+1003  ULSI Systems
+       0201  US201
+1004  VLSI Technology Inc
        0005  82C592-FC1
        0006  82C593-FC1
        0007  82C594-AFC2
-       0009  82C597-AFC2
-       000c  82C541 Lynx
-       000d  82C543 Lynx ISA
-       0702  VAS96011 (Golden Gate II)
-1005  Avance Logic
-       2301  2301
-100b  NS
+       0008  82C597-AFC2
+       000c  82C541 [Lynx]
+       000d  82C543 [Lynx]
+       0101  82C532
+       0102  82C534
+       0104  82C535
+       0105  82C147
+       0200  82C975
+       0280  82C925
+       0702  VAS96011 [Golden Gate II]
+1005  Avance Logic, Inc.
+       2301  ALG2301
+1006  Reply Group
+1007  NetFrame Systems Inc
+1008  Epson
+100a  Phoenix Technologies
+100b  National Semiconductor Corporation
+       0001  DP83810
        0002  87415
        d001  87410
-100c  Tseng'Lab
-       3202  ET4000W32P
-       3205  ET4000W32P rev B
-       3206  ET4000W32P rev C
-       3207  ET4000W32P rev D
+100c  Tseng Labs Inc
+       3202  ET4000/W32p rev A
+       3205  ET4000/W32p rev B
+       3206  ET4000/W32p rev C
+       3207  ET4000/W32p rev D
        3208  ET6000
+100d  AST Research Inc
 100e  Weitek
        9001  P9000
        9100  P9100
-1011  DEC
-       0001  DC21050
-       0002  DC21040
-       0004  TGA
-       0009  DC21140
-       000D  TGA2
-       000F  DEFPA
-       0014  DC21041
-       0019  DC21142
-       0021  DC21052
-       0024  DC21152
+1010  Video Logic, Ltd.
+1011  Digital Equipment Corporation
+       0001  DECchip 21050
+       0002  DECchip 21040 [Tulip]
+       0004  DECchip 21030 [TGA]
+       0007  NVRAM [Zephyr NVRAM]
+       0008  KZPSA [KZPSA]
+       0009  DECchip 21140 [FasterNet]
+       000d  PBXGB [TGA2]
+       000f  DEFPA
+       0014  DECchip 21041 [Tulip Pass 3]
+       0016  DGLPB [OPPO]
+       0019  DECchip 21142/43
+       0021  DECchip 21052
+       0024  DECchip 21152
+1012  Micronics Computers Inc
 1013  Cirrus Logic
        0038  GD 7548
-       00a0  GD 5430
-       00a4  GD 5434
-       00a8  GD 5434
-       00ac  GD 5436
+       00a0  GD 5430/40 [Alpine]
+       00a4  GD 5434-4 [Alpine]
+       00a8  GD 5434-8 [Alpine]
+       00ac  GD 5436 [Alpine]
        00b8  GD 5446
        00bc  GD 5480
-       00d4  GD 5464
-       00d6  GD 5465
+       00d0  GD 5462
+       00d4  GD 5464 [Laguna]
+       00d6  GD 5465 [Laguna]
        1100  CL 6729
        1110  PD 6832
-       1200  CL 7542
-       1202  CL 7543
-       1204  CL 7541
+       1200  GD 7542 [Nordic]
+       1202  GD 7543 [Viking]
+       1204  GD 7541 [Nordic Light]
 1014  IBM
        000a  Fire Coral
-       0018  Token Ring
+       0018  TR
+       001b  GXT-150P
        001d  82G2675
-       0022  82351
+       0020  MCA
+       0022  IBM27-82351
+       0036  Miami
+1015  LSI Logic Corp of Canada
+1016  ICL Personal Systems
+1017  SPEA Software AG
+1018  Unisys Systems
+1019  Elitegroup Computer Systems
+101a  AT&T GIS (NCR)
+101b  Vitesse Semiconductor
 101c  Western Digital
-       3296  WD 7197
-1022  AMD
-       2000  79C970
-       2020  53C974
-1023  Trident
-       9420  TG 9420
-       9440  TG 9440
-       9660  TG 9660 / Cyber9385
-       9750  Image 975
+       0193  33C193A
+       0197  33C197A
+       0296  33C296A
+       3193  7193
+       3197  WD 7197
+       3296  33C296A
+       4296  34C296
+       c24a  90C
+101e  American Megatrends Inc.
+       9010  MegaRAID
+101f  PictureTel
+1020  Hitachi Computer Products
+1021  OKI Electric Industry Co. Ltd.
+1022  Advanced Micro Devices
+       2000  79c970 [PCnet LANCE]
+       2020  53c974 [PCscsi]
+       2040  79c974
+1023  Trident Microsystems
+       9320  TGUI 9320
+       9420  TGUI 9420
+       9430  TGUI 9430
+       9440  TGUI 9440
+       9660  TGUI 9660/9680/9682
+       9750  3DIm`age 975
+1024  Zenith Data Systems
 1025  Acer Incorporated
        1435  M1435
-102B  Matrox
-       0518  Atlas PX2085
-       0519  Millennium
-       051A  Mystique
-       051b  Millennium II
-       0d10  MGA Impression
-102c  Chips & Technologies
+       1445  M1445
+       1449  M1449
+       1451  M1451
+       1461  M1461
+       3141  M3141
+       3143  M3143
+       3145  M3145
+       3147  M3147
+       3149  M3149
+       3151  M3151
+1028  Dell Computer Corporation
+1029  Siemens Nixdorf IS
+102a  LSI Logic
+       0000  HYDRA
+       0010  ASPEN
+102b  Matrox Graphics, Inc.
+       0518  2085PX [Atlas MGA-2]
+       0519  MGA 2064W [Millennium]
+       051a  MGA 1064SG [Mystique]
+       051b  MGA 2164W [Millennium II]
+       051f  MGA 2164W AGP [Millennium II AGP]
+       0d10  MGA Ultima/Impression
+102c  Chips and Technologies
+       00b8  64310
        00d8  65545
        00dc  65548
        00e0  65550
        00e4  65554
-1031  Miro
+102d  Wyse Technology Inc.
+102e  Olivetti Advanced Technology
+102f  Toshiba America
+1030  TMC Research
+1031  Miro Computer Products AG
        5601  ZR36050
-1033  NEC
-       0046  PowerVR PCX2
-1036  Future Domain
-       0000  TMC-18C30
+1033  NEC Corporation
+       0046  PowerVR PCX2 [midas]
+1034  Framatome Connectors USA Inc.
+1035  Comp. & Comm. Research Lab
+1036  Future Domain Corp.
+       0000  TMC-18C30 [36C70]
+1037  Hitachi Micro Systems
+1038  AMP, Inc
 1039  Silicon Integrated Systems
-       0001  6201
-       0002  6202
+       0001  SG86C201
+       0002  SG86C202
        0008  85C503
-       0205  6205
-       0406  85C501
+       0204  82C204
+       0205  SG86C205
+       0406  85C501/2
        0496  85C496
+       0597  5513C
        0601  85C601
        5107  5107
-       5511  85C5511
-       5513  85C5513
+       5511  5511/5512
+       5513  5513
        5571  5571
-       5597  5597
+       5597  5597 [SiS5582]
        7001  7001
-103c  Hewlett Packard
+103a  Seiko Epson Corporation
+103b  Tatung Co. of America
+103c  Hewlett-Packard Company
        1030  J2585A
-       1031  J2585B (Lassen)
-1042  PCTECH
-       1000  RZ1000 (buggy)
-       1001  RZ1001 (buggy?)
-1044  DPT
-       a400  SmartCache/Raid
-1045  OPTi
+       1031  J2585B
+       2910  E2910A
+       2925  E2925A
+103e  Solliday Engineering
+103f  Synopsys/Logic Modeling Group
+1040  Accelgraphics Inc.
+1041  Computrend
+1042  Micron
+       1000  FDC 37C665
+       1001  37C922
+       3000  Samurai_0
+       3010  Samurai_1
+       3020  Samurai_IDE
+1043  Asustek Computer, Inc.
+1044  Distributed Processing Technology
+       a400  PM2124A [SmartCache/Raid]
+1045  OPTi Inc.
        c178  92C178
-       c557  82C557
-       c558  82C558
+       c557  82C557 [Viper-M]
+       c558  82C558 [Viper-M ISA+IDE]
        c621  82C621
        c700  82C700
-       c701  82C701 FireStar Plus
-       c814  82C814 Firebridge 1
+       c701  82C701 [FireStar Plus]
+       c814  82C814 [Firebridge 1]
        c822  82C822
-104B  BusLogic
-       0140  MultiMaster NC
-       1040  MultiMaster
-       8130  FlashPoint
-104a  SGS Thomson
+       c824  82C824
+       d568  82C825 [Firebridge 2]
+1046  IPC Corporation, Ltd.
+1047  Genoa Systems Corp
+1048  Elsa GmbH
+1049  Fountain Technologies, Inc.
+104a  SGS Thomson Microelectronics
        0008  STG 2000X
        0009  STG 1764X
+104b  BusLogic
+       0140  BT-946C (old) [multimaster  01]
+       1040  BT-946C (BA80C30) [MultiMaster 10]
+       8130  Flashpoint LT
 104c  Texas Instruments
-       3d04  TVP4010 Permedia
-       3d07  TVP4020 Permedia 2
+       3d04  TVP4010 [Permedia]
+       3d07  TVP4020 [Permedia 2]
+       a001  TDC1570
+       a100  TDC1561
+       ac10  PCI1050
+       ac11  PCI1053
        ac12  PCI1130
+       ac13  PCI1031
        ac15  PCI1131
-104e  OAK
+104d  Sony Corporation
+104e  Oak Technology, Inc
        0107  OTI107
-1050  Winbond
-       0940  NE2000-PCI
-1057  Motorola
-       0001  MPC105 Eagle
-       0002  MPC106 Grackle
+104f  Co-time Computer Ltd
+1050  Winbond Electronics Corp
+       0940  89C940
+1051  Anigma, Inc.
+1053  Young Micro Systems
+1054  Hitachi, Ltd
+1055  EFAR Microsystems
+1056  ICL
+1057  Motorola Computer Group
+       0001  MPC105 [Eagle]
+       0002  MPC106 [Grackle]
        4801  Raven
-105a  Promise Technology
-       4d33  IDE UltraDMA/33
-       5300  DC5030
-105d  Number Nine
+1058  Electronics & Telecommunications RSH
+1059  Teknor Industrial Computers Inc
+105a  Promise Technology, Inc.
+       4d33  20246
+       5300  DC5300
+105b  Foxconn International, Inc.
+105c  Wipro Infotech Limited
+105d  Number 9 Computer Company
        2309  Imagine 128
-       2339  Imagine 128v2
-1060  UMC
+       2339  Imagine 128-II
+105e  Vtech Computers Ltd
+105f  Infotronic America Inc
+1060  United Microelectronics
+       0001  UM82C881
+       0002  UM82C886
        0101  UM8673F
+       0881  UM8881
+       0886  UM8886F
        0891  UM8891A
+       1001  UM886A
        673a  UM8886BF
+       8710  UM8710
        886a  UM8886A
        8881  UM8881F
        8886  UM8886F
+       888a  UM8886A
+       8891  UM8891A
        9017  UM9017F
+       e881  UM8881N
        e886  UM8886N
        e891  UM8891N
-1061  X TECHNOLOGY
-       0001  ITT AGX016
-1066  PicoPower
-       0001  PT86C52x Vesuvius
-106b  Apple
-       0001  Bandit
-       0002  Grand Central
-       000e  Hydra
-1074  Nexgen
-       4e78  82C501
+1061  I.I.T.
+       0001  AGX016
+       0002  IIT3204/3501
+1062  Maspar Computer Corp
+1063  Ocean Office Automation
+1064  Alcatel CIT
+1065  Texas Microsystems
+1066  PicoPower Technology
+       0000  PT80C826
+       0001  PT86C52x [Vesuvius]
+       0002  PT80C524 [Nile]
+1067  Mitsubishi Electronics
+1068  Diversified Technology
+1069  Mylex Corporation
+       0001  DAC960P
+106a  Aten Research Inc
+106b  Apple Computer Inc.
+       0001  Bandit PowerPC host bridge
+       0002  Grand Central I/O
+       000e  Hydra Mac I/O
+106c  Hyundai Electronics America
+106d  Sequent Computer Systems
+106e  DFI, Inc
+106f  City Gate Development Ltd
+1070  Daewoo Telecom Ltd
+1071  Mitac
+1072  GIT Co Ltd
+1073  Yamaha Corporation
+       0002  YGV615 [RPA3 3D-Graphics Controller]
+1074  NexGen Microsystems
+       4e78  82c501
+1075  Advanced Integrations Research
+1076  Chaintech Computer Co. Ltd
 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
+1078  Cyrix Corporation
+       0000  5510 [Grappa]
+       0001  PCI_Master
+       0002  5520 [Cognac]
+       0100  5530_Legacy [Kahlua]
+       0101  5530_SMI [Kahlua]
+       0102  5530_IDE [Kahlua]
+       0103  5530_Audio [Kahlua]
+       0104  5530_Video [Kahlua]
+1079  I-Bus
+107a  NetWorth
+107b  Gateway 2000
+107c  Goldstar
+107d  LeadTek Research Inc.
+       0000  P86C850
+107e  Interphase Corporation
+107f  Data Technology Corporation
+       0802  SL82C105
+1080  Contaq Microsystems
        0600  82C599
-1083  Forex
+1081  Supermac Technology
+1082  EFA Corporation of America
+1083  Forex Computer Corporation
+       0001  FR710
+1084  Parador
+1085  Tulip Computers Int.B.V.
+1086  J. Bond Computer Systems
+1087  Cache Computer
+1088  Microcomputer Systems (M) Son
+1089  Data General Corporation
+108a  Bit3 Computer Corp.
+108c  Oakleigh Systems Inc.
 108d  Olicom
        0001  OC-3136/3137
        0011  OC-2315
        0012  OC-2325
        0013  OC-2183/2185
        0014  OC-2326
-       0021  OC-6151/6152
-108e  Sun Microsystems
-       1000  EBUS
-       1001  Happy Meal
-       8000  PCI Bus Module
-1095  CMD
-       0640  640 (buggy)
-       0643  643
-       0646  646
+       0021  OC-6151/6152 [RapidFire ATM PCI 155]
+108e  Sun Microsystems Computer Corp.
+108f  Systemsoft
+1090  Encore Computer Corporation
+1091  Intergraph Corporation
+1092  Diamond Multimedia Systems
+1093  National Instruments
+       c801  PCI_GPIB
+1094  First International Computers
+1095  CMD Technology Inc
+       0640  PCI0640
+       0643  PCI0643
+       0646  PCI0646
+       0650  PBC0650A
        0670  670
-1098  Vision
+1096  Alacron
+1097  Appian Technology
+1098  Quantum Designs (H.K.) Ltd
        0001  QD-8500
        0002  QD-8580
-109e  Brooktree
+1099  Samsung Electronics Co., Ltd
+109a  Packard Bell
+109b  Gemlight Computer Ltd.
+109c  Megachips Corporation
+109d  Zida Technologies Ltd.
+109e  Brooktree Corporation
        0350  Bt848
-10a8  Sierra
+       0351  Bt849A
+109f  Trigem Computer Inc.
+10a0  Meidensha Corporation
+10a1  Juko Electronics Ind. Co. Ltd
+10a2  Quantum Corporation
+10a3  Everex Systems Inc
+10a4  Globe Manufacturing Sales
+10a5  Racal Interlan
+10a6  Informtech Industrial Ltd.
+10a7  Benchmarq Microelectronics
+10a8  Sierra Semiconductor
        0000  STB Horizon 64
-10aa  ACC MICROELECTRONICS
-       0000  2056
-10ad  Winbond
+10a9  Silicon Graphics
+10aa  ACC Microelectronics
+       0000  ACCM 2188
+10ab  Digicom
+10ac  Honeywell IAC
+10ad  Symphony Labs
        0001  W83769F
-       0105  SL82C105
+       0103  SL82c103
+       0105  SL82c105
        0565  W83C553
-10b3  Databook
+10ae  Cornerstone Technology
+10af  Micro Computer Systems Inc
+10b0  CardExpert Technology
+10b1  Cabletron Systems Inc
+10b2  Raytheon Company
+10b3  Databook Inc
+       3106  DB87144
        b106  DB87144
-10b7  3Com
-       5900  3C590 10bT
-       5950  3C595 100bTX
-       5951  3C595 100bT4
-       5952  3C595 100b-MII
-       9000  3C900 10bTPO
-       9001  3C900 10b Combo
-       9050  3C905 100bTX
-10b8  SMC
+10b4  STB Systems Inc
+10b5  PLX Technology, Inc.
+       9036  9036
+       9060  9060
+       906e  9060ES
+       9080  9080
+10b6  Madge Networks
+       0001  Smart 16/4 PCI Ringnode
+10b7  3Com Corporation
+       5900  3c590 10BaseT [Vortex]
+       5950  3c595 100BaseTX [Vortex]
+       5951  3c595 100BaseT4 [Vortex]
+       5952  3c595 100Base-MII [Vortex]
+       9000  3c900 10BaseT [Boomerang]
+       9001  3c900 Combo [Boomerang]
+       9050  3c905 100BaseTX
+       9051  3c905 100BaseT4
+10b8  Standard Microsystems
        0005  9432 TX
-10b9  Acer Labs
+       1000  37c665
+       1001  37C922
+10b9  Acer Laboratories Inc.
+       1435  M1435
        1445  M1445
        1449  M1449
        1451  M1451
@@ -269,74 +480,183 @@
        1513  M1513
        1521  M1521
        1523  M1523
-       1531  M1531 Aladdin IV
-       1533  M1533 Aladdin IV
+       1531  M1531
+       1533  M1533
+       3141  M3141
+       3143  M3143
+       3145  M3145
+       3147  M3147
+       3149  M3149
+       3151  M3151
+       3307  M3307
        5215  M4803
+       5217  m5217h
        5219  M5219
-       5229  M5229 TXpro
-10ba  Mitsubishi
-10bd  Surecom
+       5229  M5229
+       5235  m5225
+       5237  M5237
+10ba  Mitsubishi Electric Corp.
+10bb  Dapha Electronics Corporation
+10bc  Advanced Logic Research
+10bd  Surecom Technology
        0e34  NE-34PCI LAN
-10c8  Neomagic
-       0001  MagicGraph NM2070
-       0002  MagicGraph 128V
-       0003  MagicGraph 128ZV
-       0004  MagicGraph NM2160
-10cd  Advanced System Products
-       1200  ABP940
-       1300  ABP940U
-10dc  CERN
+10be  Tseng Labs International Co.
+10bf  Most Inc
+10c0  Boca Research Inc.
+10c1  ICM Co., Ltd.
+10c2  Auspex Systems Inc.
+10c3  Samsung Semiconductors, Inc.
+10c4  Award Software International Inc.
+10c5  Xerox Corporation
+10c6  Rambus Inc.
+10c7  Media Vision
+10c8  Neomagic Corporation
+       0001  NM2070 [MagicGraph NM2070]
+       0002  NM2090 [MagicGraph 128V]
+       0003  NM2093 [MagicGraph 128ZV]
+       0004  NM2160 [MagicGraph 128XD]
+10c9  Dataexpert Corporation
+10ca  Fujitsu Microelectr., Inc.
+10cb  Omron Corporation
+10cc  Mentor ARC Inc
+10cd  Advanced System Products, Inc
+       1200  ASC1200 [(abp940) Fast SCSI-II]
+       1300  ABP940-U
+       2300  ABP940-UW
+10ce  Radius
+10cf  Citicorp TTI
+       2001  mb86605
+10d0  Fujitsu Limited
+10d1  FuturePlus Systems Corp.
+10d2  Molex Incorporated
+10d3  Jabil Circuit Inc
+10d4  Hualon Microelectronics
+10d5  Autologic Inc.
+10d6  Cetia
+10d7  BCM Advanced Research
+10d8  Advanced Peripherals Labs
+10d9  Macronix, Inc.
+10da  Compaq IPG-Austin
+10db  Rohm LSI Systems, Inc.
+10dc  CERN/ECP/EDU
        0001  STAR/RD24 SCI-PCI (PMC)
-       0002  STAR/RD24 SCI-PCI (PMC)
-10de  NVidia
-10e0  IMS
+       0002  TAR/RD24 SCI-PCI (PMC) [ATT 2C15-3 (FPGA)  SCI bridge  on PCI 5 Volt card]
+10dd  Evans & Sutherland
+10de  Nvidia Corporation
+       0008  NV1
+       0009  DAC64
+10df  Emulex Corporation
+10e0  Integrated Micro Solutions Inc.
+       5026  IMS5026/27/28
        8849  8849
-10e1  Tekram
-       690c  DC690c
-10e3  Tundra
-       0000  CA91C042 Universe
-10e8  AMCC
-       8043  Myrinet PCI (M2-PCI-32)
-       807d  S5933 PCI44
-       809c  S5933 Traquair HEPC3
-10ea  Intergraphics
+       9128  IMS9129
+10e1  Tekram Technology Co.,Ltd.
+       690c  690c
+       dc29  DC290
+10e2  Aptix Corporation
+10e3  Tundra Semiconductor
+       0000  CA91C042 [Universe]
+       0860  CA91C860 [QSpan]
+10e4  Tandem Computers
+10e5  Micro Industries Corporation
+10e6  Gainbery Computer Products Inc.
+10e7  Vadem
+10e8  Applied Micro Circuits Corporation
+       5920  S5920
+       8043  LANai4.x [Myrinet LANai interface chip]
+       807d  S5933 [Matchmaker]
+       809c  S5933_HEPC3
+10e9  Alps Electric Co., Ltd.
+10ea  Intergraphics Systems
        1680  IGA-1680
        1682  IGA-1682
-10ec  Realtek
+10eb  Artists Graphics
+       0101  3GA
+10ec  Realtek Semiconductor Co., Ltd.
        8029  8029
        8129  8129
+10ed  Ascii Corporation
+       7310  V7310
+10ee  Xilinx, Inc.
+10ef  Racore Computer Products, Inc.
+10f0  Peritek Corporation
+10f1  Tyan Computer
+10f2  Achme Computer, Inc.
+10f3  Alaris, Inc.
+10f4  S-MOS Systems, Inc.
+10f5  NKK Corporation
+       a001  NDR4000 [NR4600 Bridge]
+10f6  Creative Electronic Systems SA
+10f7  Matsushita Electric Industrial Co., Ltd.
+10f8  Altos India Ltd
+10f9  PC Direct
 10fa  Truevision
        000c  TARGA 1000
-1101  Initio Corp
+10fb  Thesys Gesellschaft für Mikroelektronik mbH
+10fc  I-O Data Device, Inc.
+10fd  Soyo Computer, Inc
+10fe  Fast Multimedia AG
+10ff  NCube
+1100  Jazz Multimedia
+1101  Initio Corporation
        9100  320 P
-1106  VIA Technologies
+       9500  360P
+1102  Creative Labs
+1103  Triones Technologies, Inc.
+1104  RasterOps Corp.
+1105  Sigma Designs, Inc.
+1106  VIA Technologies, Inc.
        0505  VT 82C505
        0561  VT 82C561
-       0571  VT 82C586 Apollo IDE
-       0576  VT 82C576 3V
-       0585  VT 82C585 Apollo VP1/VPX
-       0586  VT 82C586 Apollo ISA
-       0595  VT 82C595 Apollo VP2
-       0926  VT 82C926 Amazon
+       0571  VT82C586 IDE [Apollo]
+       0576  VT 82C576 3V [Apollo Master]
+       0585  VT82C585VP [Apollo VP1/VPX]
+       0586  VT82C586 ISA [Apollo VP]
+       0595  VT82C595 [Apollo VP2]
+       0926  VT82C926 [Amazon]
+       1000  82C570MV
+       1106  82C570MV
        1571  VT 82C416MV
-       1595  VT 82C595 Apollo VP2/97
-       3038  VT 82C586 Apollo USB
-       3040  VT 82C586B Apollo ACPI
-1119  VORTEX
-       0000  GDT 60
-       0001  GDT 6000b
-       0002  GDT 6110/6510
-       0003  GDT 6120/6520
-       0004  GDT 6530
-       0005  GDT 6550
-       0006  GDT 6117/6517
-       0007  GDT 6127/6527
-       0008  GDT 6537
-       0009  GDT 6557
-       000a  GDT 6115/6515
-       000b  GDT 6125/6525
-       000c  GDT 6535
-       000d  GDT 6555
+       1595  VT82C595/97 [Apollo VP2/97]
+       3038  82C586_2 [VT82C586B USB]
+       3040  82C586_3 [VT82C586B ACPI]
+1107  Stratus Computers
+1108  Proteon, Inc.
+       0100  p1690plus_AA
+       0101  p1690plus_AB
+1109  Cogent Data Technologies, Inc.
+       1400  EM110TX [EX110TX PCI Fast Ethernet Adapter]
+110a  Siemens Nixdorf AG
+       6120  SZB6120
+110b  Chromatic Research Inc.
+110c  Mini-Max Technology, Inc.
+110d  Znyx Advanced Systems
+110e  CPU Technology
+110f  Ross Technology
+1110  Powerhouse Systems
+1111  Santa Cruz Operation
+1112  RNS - Div. of Meret Communications Inc
+1113  Accton Technology Corporation
+1114  Atmel Corporation
+1115  3D Labs
+1116  Data Translation
+1117  Datacube, Inc
+1118  Berg Electronics
+1119  ICP Vortex Computersysteme GmbH
+       0000  GDT6000/6020/6050
+       0001  GDT6000b/6010
+       0002  GDT6110/6510
+       0003  GDT6120/6520
+       0004  GDT6530
+       0005  GDT6550
+       0006  GDT6x17
+       0007  GDT6x27
+       0008  GDT6537
+       0009  GDT5557
+       000a  GDT6x15
+       000b  GDT6x25
+       000c  GDT6535
+       000d  GDT6555
        0100  GDT 6117RP/6517RP
        0101  GDT 6127RP/6527RP
        0102  GDT 6537RP
@@ -355,181 +675,678 @@
        0123  GDT 6557RP2
        0124  GDT 6111RP2/6511RP2
        0125  GDT 6121RP2/6521RP2
-111a  Efficient Networks
+111a  Efficient Networks, Inc
        0000  155P-MF1 (FPGA)
        0002  155P-MF1 (ASIC)
-1127  Fore Systems
+111b  Teledyne Electronic Systems
+111c  Tricord Systems Inc.
+111d  Integrated Device Tech
+111e  Eldec
+111f  Precision Digital Images
+1120  EMC Corporation
+1121  Zilog
+1122  Multi-tech Systems, Inc.
+1123  Excellent Design, Inc.
+1124  Leutron Vision AG
+1125  Eurocore
+1127  FORE Systems Inc
        0210  PCA-200PC
        0300  PCA-200E
-112f  Imaging Technology
+1129  Firmworks
+112a  Hermes Electronics Company, Ltd.
+112b  Linotype - Hell AG
+112c  Zenith Data Systems
+112d  Ravicad
+112e  Infomedia Microelectronics Inc.
+112f  Imaging Technology Inc
        0000  MVC IC-PCI
-1131  Philips
+1130  Computervision
+1131  Philips Semiconductors
        7146  SAA7146
-113c  PLX
-       0001  PCI9060 i960 bridge
-1142  Alliance
-       3210  Promotion-6410
-       6422  Provideo
+1132  Mitel Corp.
+1133  Eicon Technology Corporation
+1134  Mercury Computer Systems
+1135  Fuji Xerox Co Ltd
+1136  Momentum Data Systems
+1137  Cisco Systems Inc
+1138  Ziatech Corporation
+       8905  8905 [STD 32 Bridge]
+1139  Dynamic Pictures, Inc
+113a  FWB Inc
+113b  Network Computing Devices
+113c  Cyclone Microsystems, Inc.
+       0911  PCI-911 [PCI-based i960Jx Intelligent I/O Controller]
+       0912  PCI-912 [i960CF-based Intelligent I/O Controller]
+       0913  PCI-913
+113d  Leading Edge Products Inc
+113e  Sanyo Electric Co
+113f  Equinox Systems, Inc.
+1140  Intervoice Inc
+1141  Crest Microsystem Inc
+1142  Alliance Semiconductor Corporation
+       3210  AP6410
+       6422  AP6422
        6424  AT24
        643d  AT3D
+1143  NetPower, Inc
+1144  Cincinnati Milacron
+1145  Workbit Corporation
+1146  Force Computers
+1147  Interface Corp
+1148  Schneider & Koch
+1149  Win System Corporation
 114a  VMIC
        7587  VMIVME-7587
-114f  Digi Intl.
+114b  Canopus Co., Ltd
+114c  Annabooks
+114d  IC Corporation
+114e  Nikon Systems Inc
+114f  Digi International
+       0002  AccelePort EPC
        0003  RightSwitch SE-6
-1159  Mutech
+       0004  AccelePort Xem
+       0006  AccelePort Xr,C/X
+       0009  AccelePort Xr/J
+       000a  AccelePort EPC/J
+1150  Thinking Machines Corp
+1151  JAE Electronics Inc.
+1152  Megatek
+1153  Land Win Electronic Corp
+1154  Melco Inc
+1155  Pine Technology Ltd
+1156  Periscope Engineering
+1157  Avsys Corporation
+1158  Voarx R & D Inc
+1159  Mutech Corp
        0001  MV-1000
+115a  Harlequin Ltd
+115b  Parallax Graphics
+115c  Photron Ltd.
+115d  Xircom
+115e  Peer Protocols Inc
+115f  Maxtor Corporation
+1160  Megasoft Inc
+1161  PFU Limited
+1162  OA Laboratory Co Ltd
 1163  Rendition
-       0001  Verite 1000
-       2000  Verite 2100
-1179  Toshiba
-       0601  Laptop
-1180  Ricoh
+       0001  Verite 1000 PCI
+       2000  Verite V2100
+1164  Advanced Peripherals Technologies
+1165  Imagraph Corporation
+1166  Pequr Technology
+1167  Mutoh Industries Inc
+1168  Thine Electronics Inc
+1169  Centre for Development of Advanced Computing
+116a  Polaris Communications
+116b  Connectware Inc
+116c  Intelligent Resources Integrated Systems
+116d  Martin-Marietta
+116e  Electronics for Imaging
+116f  Workstation Technology
+1170  Inventec Corporation
+1171  Loughborough Sound Images Plc
+1172  Altera Corporation
+1173  Adobe Systems, Inc
+1174  Bridgeport Machines
+1175  Mitron Computer Inc.
+1176  SBE Incorporated
+1177  Silicon Engineering
+1178  Alfa, Inc.
+1179  Toshiba America Info Systems
+       0601  601
+       060a  ToPIC95
+117b  L G Electronics, Inc.
+117c  Atto Technology
+117d  Becton & Dickinson
+117e  T/R Systems
+117f  Integrated Circuit Systems
+1180  Ricoh Co Ltd
        0466  RL5C466
-1193  ZeitNet
+1181  Telmatics International
+1183  Fujikura Ltd
+1184  Forks Inc
+1185  Dataworld International Ltd
+1186  D-Link System Inc
+1187  Advanced Technology Laboratories, Inc.
+1188  Shima Seiki Manufacturing Ltd.
+1189  Matsushita Electronics Co Ltd
+118a  Hilevel Technology
+118b  Hypertec Pty Limited
+118c  Corollary, Inc
+       0014  PCIB [C-bus II to PCI bus host bridge chip]
+118d  BitFlow Inc
+       0001  n/a [Raptor-PCI framegrabber]
+118e  Hermstedt GmbH
+118f  Green Logic
+1191  Artop Electronic Corp
+       0004  ATP8400
+       0005  ATP850UF
+1192  Densan Company Ltd
+1193  Zeitnet Inc.
        0001  1221
        0002  1225
-119b  Omega Micro
+1194  Toucan Technology
+1195  Ratoc System Inc
+1196  Hytec Electronics Ltd
+1197  Gage Applied Sciences, Inc.
+1198  Lambda Systems Inc
+1199  Attachmate Corporation
+119a  Mind Share, Inc.
+119b  Omega Micro Inc.
        1221  82C092G
-11ad  LiteOn
+119c  Information Technology Inst.
+119d  Bug, Inc. Sapporo Japan
+119e  Fujitsu Microelectronics Ltd.
+119f  Bull HN Information Systems
+11a0  Convex Computer Corporation
+11a1  Hamamatsu Photonics K.K.
+11a2  Sierra Research and Technology
+11a3  Deuretzbacher GmbH & Co. Eng. KG
+11a4  Barco Graphics NV
+11a5  Microunity Systems Eng. Inc
+11a6  Pure Data Ltd.
+11a7  Power Computing Corp.
+11a8  Systech Corp.
+11a9  InnoSys Inc.
+11aa  Actel
+11ab  Galileo Technology Ltd.
+       0146  GT-64010
+       4801  GT-48001
+11ac  Canon Information Systems Research Aust.
+11ad  Lite-On Communications Inc
        0002  LNE100TX
-11bc  Network Peripherals
+11ae  Aztech System Ltd
+11af  Avid Technology Inc.
+11b0  V3 Semiconductor Inc.
+       0292  V292PBC [Am29030/40 Bridge]
+       0960  V96xPBC
+       c960  V96DPC
+11b1  Apricot Computers
+11b2  Eastman Kodak
+11b3  Barr Systems Inc.
+11b4  Leitch Technology International
+11b5  Radstone Technology Plc
+11b6  United Video Corp
+11b8  XPoint Technologies, Inc
+11b9  Pathlight Technology Inc.
+11ba  Videotron Corp
+11bb  Pyramid Technology
+11bc  Network Peripherals Inc
        0001  NP-PCI
-11cb  Specialix
-       4000  XIO/SIO host
-       8000  RIO host
+11bd  Pinnacle Systems Inc.
+11be  International Microcircuits Inc
+11bf  Astrodesign, Inc.
+11c0  Hewlett Packard
+11c1  AT&T Microelectronics
+11c2  Sand Microelectronics
+11c4  Document Technologies, Inc
+11c5  Shiva Corporation
+11c6  Dainippon Screen Mfg. Co. Ltd
+11c7  D.C.M. Data Systems
+11c8  Dolphin Interconnect Solutions AS
+       0658  PSB
+11c9  Magma
+11ca  LSI Systems, Inc
+11cb  Specialix Research Ltd.
+       2000  PCI_9050
+       4000  SUPI_1
+       8000  T225
+11cc  Michels & Kleberhoff Computer GmbH
+11cd  HAL Computer Systems, Inc.
+11ce  Netaccess
+11cf  Pioneer Electronic Corporation
+11d0  Lockheed Martin Federal Systems-Manassas
 11d1  Auravision
-       01f7  VXP524
-11d5  Ikon
-       0115  10115 Greensheet
-       0117  10117 Greensheet
-11de  Zoran
+       01f7  VxP524
+11d2  Intercom Inc.
+11d3  Trancell Systems Inc
+11d4  Analog Devices
+11d5  Ikon Corporation
+       0115  10115
+       0117  10117
+11d6  Tekelec Telecom
+11d7  Trenton Technology, Inc.
+11d8  Image Technologies Development
+11d9  TEC Corporation
+11da  Novell
+11db  Sega Enterprises Ltd
+11dc  Questra Corporation
+11dd  Crosfield Electronics Limited
+11de  Zoran Corporation
        6057  ZR36057
        6120  ZR36120
+11df  New Wave PDG
+11e0  Cray Communications A/S
+11e1  GEC Plessey Semi Inc.
+11e2  Samsung Information Systems America
+11e3  Quicklogic Corporation
+11e4  Second Wave Inc
+11e5  IIX Consulting
+11e6  Mitsui-Zosen System Research
+11e7  Toshiba America, Elec. Company
+11e8  Digital Processing Systems Inc.
+11e9  Highwater Designs Ltd.
+11ea  Elsag Bailey
+11eb  Formation Inc.
+11ec  Coreco Inc
+11ed  Mediamatics
+11ee  Dome Imaging Systems Inc
+11ef  Nicolet Technologies B.V.
+11f0  Compu-Shack GmbH
+11f1  Symbios Logic Inc
+11f2  Picture Tel Japan K.K.
+11f3  Keithley Metrabyte
+11f4  Kinetic Systems Corporation
+11f5  Computing Devices International
 11f6  Compex
-       0112  Readylink ENET100-VG4
+       0112  ENet100VG4
        1401  ReadyLink 2000
-11fe  Comtrol
+11f7  Scientific Atlanta
+11f8  PMC-Sierra Inc.
+       7375  PM7375 [LASAR-155 ATM SAR]
+11f9  I-Cube Inc
+11fa  Kasan Electronics Company, Ltd.
+11fb  Datel Inc
+11fc  Silicon Magic
+11fd  High Street Consultants
+11fe  Comtrol Corporation
        0001  RocketPort 8 Oct
        0002  RocketPort 8 Intf
        0003  RocketPort 16 Intf
        0004  RocketPort 32 Intf
-120e  Cyclades
-       0100  Cyclom-Y below 1Mbyte
-       0101  Cyclom-Y above 1Mbyte
-       0200  Cyclom-Z below 1Mbyte
-       0201  Cyclom-Z above 1Mbyte
-121a  3Dfx
-       0001  Voodoo
-1236  Sigma Designs
-       6401  REALmagic64/GX
-124d  Stallion
-       0000  EasyConnection 8/32
-       0002  EasyConnection 8/64
-       0003  EasyIO
-1255  Optibase
+11ff  Scion Corporation
+1200  CSS Corporation
+1201  Vista Controls Corp
+1202  Network General Corp.
+1203  Bayer Corporation, Agfa Division
+1204  Lattice Semiconductor Corporation
+1205  Array Corporation
+1206  Amdahl Corporation
+1208  Parsytec GmbH
+1209  SCI Systems Inc
+120a  Synaptel
+120b  Adaptive Solutions
+120c  Technical Corp.
+120d  Compression Labs, Inc.
+120e  Cyclades Corporation
+       0100  Cyclom_Y
+       0200  Cyclom_Z
+120f  Essential Communications
+1210  Hyperparallel Technologies
+1211  Braintech Inc
+1212  Kingston Technology Corp.
+1213  Applied Intelligent Systems, Inc.
+1214  Performance Technologies, Inc.
+1215  Interware Co., Ltd
+1216  Purup Prepress A/S
+1217  02 Micro, Inc.
+       6832  6832
+1218  Hybricon Corp.
+1219  First Virtual Corporation
+121a  3Dfx Interactive, Inc.
+       0001  Voodoo [voodoo]
+121b  Advanced Telecommunications Modules
+121c  Nippon Texaco., Ltd
+121d  Lippert Automationstechnik GmbH
+121e  CSPI
+121f  Arcus Technology, Inc.
+1220  Ariel Corporation
+1221  Contec Co., Ltd
+1222  Ancor Communications, Inc.
+1223  Heurikon/Computer Products
+1224  Interactive Images
+1225  Power I/O, Inc.
+1227  Tech-Source
+1228  Norsk Elektro Optikk A/S
+1229  Data Kinesis Inc.
+122a  Integrated Telecom
+122b  LG Industrial Systems Co., Ltd
+122c  Sican GmbH
+122d  Aztech System Ltd
+122e  Xyratex
+122f  Andrew Corporation
+1230  Fishcamp Engineering
+1231  Woodward McCoach, Inc.
+1232  GPT Limited
+1233  Bus-Tech, Inc.
+1234  Technical Corp.
+1235  Risq Modular Systems, Inc.
+1236  Sigma Designs Corporation
+       6401  REALmagic 64/GX (SD 6425)
+1237  Alta Technology Corporation
+1238  Adtran
+1239  3DO Company
+123a  Visicom Laboratories, Inc.
+123b  Seeq Technology, Inc.
+123c  Century Systems, Inc.
+123d  Engineering Design Team, Inc.
+123e  Simutech, Inc.
+123f  C-Cube Microsystems
+1240  Marathon Technologies Corp.
+1241  DSC Communications
+1243  Delphax
+1244  AVM Audiovisuelles MKTG & Computer GmbH
+1245  A.P.D., S.A.
+1246  Dipix Technologies, Inc.
+1247  Xylon Research, Inc.
+1248  Central Data Corporation
+1249  Samsung Electronics Co., Ltd.
+124a  AEG Electrocom GmbH
+124b  Greenspring Computers Inc.
+124c  Solitron Technologies, Inc.
+124d  Stallion Technologies, Inc.
+       0000  EasyConnection 8/32 - PCI
+       0002  EasyConnection 8/64 - PCI
+       0003  EasyIO - PCI
+124e  Cylink
+124f  Infotrend Technology, Inc.
+1250  Hitachi Microcomputer System Ltd
+1253  Guzik Technical Enterprises
+1254  Linear Systems Ltd.
+1255  Optibase Ltd
        1110  MPEG Forge
        1210  MPEG Fusion
        2110  VideoPlex
        2120  VideoPlex CC
        2130  VideoQuest
+1256  Perceptive Solutions, Inc.
+1257  Vertex Networks, Inc.
+1258  Gilbarco, Inc.
+1259  Allied Telesyn International
+125a  ABB Power Systems
+125b  Asix Electronics Corporation
+125c  Aurora Technologies, Inc.
+125d  ESS Technology
+125e  Specialvideo Engineering SRL
+125f  Concurrent Technologies, Inc.
+1260  Harris Semiconductor
+1262  ES Computer Company, Ltd.
+1263  Sonic Solutions
+1264  Aval Nagasaki Corporation
+1265  Casio Computer Co., Ltd.
+1266  Microdyne Corporation
+1267  S. A. Telecommunications
+1268  Tektronix
+1269  Thomson-CSF/TTM
+126a  Lexmark International, Inc.
+126b  Adax, Inc.
+126c  Northern Telecom
+126d  Splash Technology, Inc.
+126e  Sumitomo Metal Industries, Ltd.
+126f  Silicon Motion, Inc.
+1270  Olympus Optical Co., Ltd.
+1271  GW Instruments
+1272  Telematics International
+1273  Hughes Network Systems
 1274  Ensoniq
        5000  AudioPCI
-12c5  Picture Elements
-       0081  PCIVST
-12d2  NVidia/SGS Thomson
-       0018  Riva 128
+1275  Network Appliance Corporation
+1276  Switched Network Technologies, Inc.
+1277  Comstream
+1278  Transtech Parallel Systems Ltd.
+1279  Transmeta Corporation
+127a  Rockwell International
+127b  Pixera Corporation
+127c  Crosspoint Solutions, Inc.
+127d  Vela Research
+127e  Winnov, L.P.
+127f  Fujifilm
+1280  Photoscript Group Ltd.
+1281  Yokogawa Electric Corporation
+1282  Davicom Semiconductor, Inc.
+1283  Integrated Technology Express, Inc.
+1284  Sahara Networks, Inc.
+1285  Platform Technologies, Inc.
+1286  Mazet GmbH
+1287  M-Pact, Inc.
+1288  Timestep Corporation
+1289  AVC Technology, Inc.
+128a  Asante Technologies, Inc.
+128b  Transwitch Corporation
+128c  Retix Corporation
+128d  G2 Networks, Inc.
+128e  Samho Multi Tech Ltd.
+128f  Tateno Dennou, Inc.
+1290  Sord Computer Corporation
+1291  NCS Computer Italia
+1293  Media Reality Technology
+1294  Rhetorex, Inc.
+1295  Imagenation Corporation
+1296  Kofax Image Products
+1297  Holco Enterprise Co, Ltd/Shuttle Computer
+1298  Spellcaster Telecommunications Inc.
+1299  Knowledge Technology Lab.
+129b  Image Access
+129c  Jaycor
+129d  Compcore Multimedia, Inc.
+129e  Victor Company of Japan, Ltd.
+129f  OEC Medical Systems, Inc.
+12a0  Allen-Bradley Company
+12a1  Simpact Associates, Inc.
+12a2  Newgen Systems Corporation
+12a3  Lucent Technologies
+12a4  NTT Electronics Technology Company
+12a5  Vision Dynamics Ltd.
+12a6  Scalable Networks, Inc.
+12a7  AMO GmbH
+12a8  News Datacom
+12a9  Xiotech Corporation
+12aa  SDL Communications, Inc.
+12ab  Yuan Yuan Enterprise Co., Ltd.
+12ac  Measurex Corporation
+12ad  Multidata GmbH
+12ae  Alteon Networks Inc.
+12af  TDK USA Corp
+12b0  Jorge Scientific Corp
+12b1  GammaLink
+12b2  General Signal Networks
+12b3  Inter-Face Co Ltd
+12b4  FutureTel Inc
+12b5  Granite Systems Inc.
+12b6  Natural Microsystems
+12b7  Acumen
+12b8  Korg
+12b9  US Robotics
+12ba  PMC Sierra
+12bb  Nippon Unisoft Corporation
+12bc  Array Microsystems
+12bd  Computerm Corp.
+12be  Anchor Chips
+12bf  Fujifilm Microdevices
+12c0  Infimed
+12c1  GMM Research Corp
+12c2  Mentec Limited
+12c3  Holtek Microelectronics Inc
+12c4  Connect Tech Inc
+12c5  Picture Elements Incorporated
+       0081  PCIVST [PCI Grayscale Thresholding Engine]
+12c6  Mitani Corporation
+12c7  Dialogic Corp
+12c8  G Force Co, Ltd
+12c9  Gigi Operations
+12ca  Integrated Computing Engines
+12cb  Antex Electronics Corporation
+12cc  Pluto Technologies International
+12cd  Aims Lab
+12ce  Netspeed Inc.
+12cf  Prophet Systems, Inc.
+12d0  GDE Systems, Inc.
+12d1  PSITech
+12d2  NVidia / SGS Thomson (Joint Venture)
+       0018  Riva128
+12d3  Vingmed Sound A/S
+12d4  DGM&S
+12d5  Equator Technologies
+12d6  Analogic Corp
+12d7  Biotronic SRL
+12d8  Pericom Semiconductor
+12d9  Aculab PLC
+12da  True Time
+12db  Annapolis Micro Systems, Inc
+12dc  Symicron Computer Communication Ltd.
+12dd  Management Graphics
+12de  Rainbow Technologies
+12df  SBS Technologies Inc
+12e0  Chase Research
+12e1  Nintendo Co, Ltd
+12e2  Datum Inc. Bancomm-Timing Division
+12e3  Imation Corp - Medical Imaging Systems
+12e4  Brooktrout Technology Inc
+12e5  Apex Inc
+12e6  Cirel Systems
+12e7  Sunsgroup Corporation
+12e8  Crisc Corp
+12e9  GE Spacenet
+12ea  Zuken
+12eb  Aureal Semiconductor
+12ec  3A International, Inc.
+12ed  Optivision Inc.
+12ee  Orange Micro
+12ef  Vienna Systems
+12f0  Pentek
+12f1  Sorenson Vision Inc
+12f2  Gammagraphx, Inc.
+12f3  Radstone Technology
+12f4  Megatel
+12f5  Forks
+12f6  Dawson France
+12f7  Cognex
 1c1c  Symphony
        0001  82C101
-1de1  Tekram
-       dc29  DC-290
-3d3d  3Dlabs
+270f  Chaintech Computer Co. Ltd
+3d3d  3DLabs
        0001  GLINT 300SX
        0002  GLINT 500TX
        0003  GLINT Delta
-       0004  PERMEDIA
-4005  Avance
+       0004  Permedia
+4005  Avance Logic Inc.
        2064  ALG2064i
-       2302  ALG-2302
+       2301  ALG2301
+       2302  ALG2302
+4680  Umax Computer Corp
 4a14  NetVin
-       5000  NV5000
+       5000  PCI NV5000SC
 5333  S3 Inc.
-       0551  PLATO/PX (system)
-       5631  ViRGE
-       8811  Trio32/Trio64
+       0551  Plato/PX (system)
+       5631  86C325 [ViRGE]
+       8810  86C764_0 [Trio 32 vers 0]
+       8811  86C764_1 [Trio 32/64 vers 1]
        8812  Aurora64V+
+       8813  86C764_3 [Trio 32/64 vers 3]
        8814  Trio64UV+
+       8815  Aurora128
        883d  ViRGE/VX
-       8880  Vision 868
-       88b0  Vision 928-P
-       88c0  Vision 864-P
-       88c1  Vision 864-P
-       88d0  Vision 964-P
-       88d1  Vision 964-P
+       8880  Vision 868 vers 0
+       8881  Vision 868 vers 1
+       8882  Vision 868 vers 2
+       8883  Vision 868 vers 3
+       88b0  Vision 928 vers 0
+       88b1  Vision 928 vers 1
+       88b2  Vision 928 vers 2
+       88b3  Vision 928 vers 3
+       88c0  Vision 864 vers 0
+       88c1  Vision 864 vers 1
+       88c2  86C864
+       88c3  86C864
+       88d0  Vision 964 vers 0
+       88d1  Vision 964 vers 1
+       88d2  86C964
+       88d3  86C964
        88f0  Vision 968
+       88f1  86C968
+       88f2  86C968
+       88f3  86C968
        8901  Trio64V2/DX or /GX
-       8902  PLATO/PX (graphics)
+       8902  Plato/PX (graphics)
        8a01  ViRGE/DX or /GX
        8a10  ViRGE/GX2
        8c01  ViRGE/MX
        8c02  ViRGE/MX+
        8c03  ViRGE/MX+MV
-8086  Intel
+       ca00  SonicVibes
+6374  c't Magazin für Computertechnik
+       6773  GPPCI
+8008  Quancm Electronic GmbH
+       0010  WDOG1 [PCI-Watchdog 1]
+       0011  PWDOG2 [Watchdog2/PCI]
+8086  Intel Corporation
        0482  82375EB
-       0483  82424ZX Saturn
-       0484  82378IB
-       0486  82430ZX Aries
-       04a3  82434LX Mercury/Neptune
-       1221  82092AA PCMCIA bridge
-       1222  82092AA EIDE
+       0483  82424ZX [Saturn]
+       0484  82378IB [SIO ISA Bridge]
+       0486  82430ZX [Aries]
+       04a3  82434LX [Mercury/Neptune]
+       0960  80960RP [i960 RP Microprocessor/Bridge]
+       1221  82092AA_0
+       1222  82092AA_1
        1223  SAA7116
        1226  82596
        1227  82865
+       1228  82556
        1229  82557
-       122d  82437
-       122e  82371 Triton PIIX
-       1230  82371 Triton PIIX
-       1234  430MX - 82371MX MPIIX
-       1235  430MX - 82437MX MTSC
-       1237  82441FX Natoma
-       1250  82439HX Triton II
-       7000  82371SB Natoma/Triton II PIIX3
-       7010  82371SB Natoma/Triton II PIIX3
-       7020  82371SB Natoma/Triton II PIIX3
-       7030  82437VX Triton II
-       7100  82439TX
+       122d  430FX - 82437FX TSC [Triton I]
+       122e  82371FB PIIX ISA [Triton I]
+       1230  82371FB PIIX IDE [Triton I]
+       1234  430MX - 82371MX MPIIX [430MX PCIset - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX)]
+       1235  430MX - 82437MX MTSC [430MX PCIset - 82437MX Mobile System Controller (MTSC) and 82438MX Mobile Data Path (MTDP)]
+       1237  440FX - 82441FX PMC [Natoma]
+       1250  430HX - 82439HX TXC [Triton II]
+       1960  80960RP [i960RP Microprocessor]
+       7000  82371SB PIIX3 ISA [Natoma/Triton II]
+       7010  82371SB PIIX3 IDE [Natoma/Triton II]
+       7020  82371SB PIIX3 USB [Natoma/Triton II]
+       7030  430VX - 82437VX TVX [Triton VX]
+       7100  430TX - 82439TX MTXC
        7110  82371AB PIIX4 ISA
        7111  82371AB PIIX4 IDE
        7112  82371AB PIIX4 USB
        7113  82371AB PIIX4 ACPI
        7180  440LX - 82443LX PAC Host
        7181  440LX - 82443LX PAC AGP
-       84c4  Orion P6
-       84c5  82450GX Orion P6
+       84c4  82450KX [Orion]
+       84c5  82450GX [Orion]
+8800  Trigem Computer Inc.
+8888  Silicon Magic
+8e0e  Computone Corporation
 8e2e  KTI
        3000  ET32P2
 9004  Adaptec
+       1078  AIC-7810
        5078  AIC-7850
+       5178  7851
+       5278  7852
+       5575  2930
        5578  AIC-7855
        5800  AIC-5800
        6078  AIC-7860
        6178  AIC-7861
+       6278  AIC-7860
+       6378  AIC-7860
        7078  AIC-7870
        7178  AIC-7871
        7278  AIC-7872
        7378  AIC-7873
-       7478  AIC-7874
-       7895  AIC-7895U
+       7478  AIC-7874 [AHA-2944]
+       7578  7875
+       7678  7876
+       7895  AIC-7895
        8078  AIC-7880U
        8178  AIC-7881U
        8278  AIC-7882U
        8378  AIC-7883U
        8478  AIC-7884U
+       8578  7885
+       8678  7886
 907f  Atronics
        2015  IDE-2015PL
-edd8  ARK Logic
-       a091  Stingray
-       a099  Stingray ARK 2000PV
+9412  Holtek
+       6565  6565
+c0fe  Motion Engineering, Inc.
+e159  Tiger Jet Network Inc.
+edd8  ARK Logic Inc
+       a091  1000PV [Stingray]
+       a099  2000PV [Stingray]
        a0a1  2000MT
+       a0a9  2000MI
 
 # List of known device classes and subclasses
 

diff --git a/pciutils.h b/pciutils.h
index fe0388d90c2e69d47d897489ca90e018163d668d..2bfc63ba487039dca1a673a7edce826012d187d7 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -1,22 +1,17 @@
 /*
- *     $Id: pciutils.h,v 1.1 1997/12/23 10:29:18 mj Exp $
+ *     $Id: pciutils.h,v 1.2 1998/01/27 11:50:13 mj Exp $
  *
  *     Linux PCI Utilities -- Declarations
  *
- *     Copyright (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997, 1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
 
 #include <linux/types.h>
 
-#if 1
 #define PROC_BUS_PCI "/proc/bus/pci"
 #define ETC_PCI_IDS "/etc/pci.ids"
-#else
-#define PROC_BUS_PCI "/tmp/bus/pci"
-#define ETC_PCI_IDS "pci.ids"
-#endif
 
 /* Types */
 
@@ -31,6 +26,7 @@ void *xmalloc(unsigned int);
 /* names.c */
 
 extern int show_numeric_ids;
+extern char *pci_ids;
 
 char *lookup_vendor(word);
 char *lookup_device(word, word);

diff --git a/pciutils.lsm b/pciutils.lsm
index 7d8e611c1a542c17237970464c3fc6629c64a216..20b8a16502a63bb2cb3090fa2ce217d9bed80db1 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title:          Linux PCI Utilities
-Version:        0.9
-Entered-date:   971227
+Version:        0.91
+Entered-date:   980127
 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
+               kernel version 2.1.82 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/???
+Primary-site:   atrey.karlin.mff.cuni.cz pub/local/mj/pciutils-0.91.tar.gz
+Alternate-site: sunsite.unc.edu pub/Linux/system/hardware
 Copying-policy: GPL
 End