Released as version 2.1.

diff --git a/ChangeLog b/ChangeLog
index 963801e6644379230c606f55854f4679503ad227..3a7ab4858323f63c8e840505759273e250b59575 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 30 11:06:35 1999  Martin Mares  <mj@albireo.ucw.cz>
+
+       * Released as version 2.1.
+
+       * pci.ids: Synced to devlist.h in 2.3.24 kernel. Merged in
+       lots of contributed entries.
+

 Thu Oct 14 10:40:12 1999  Dave Jones    <dave@powertweak.com>
 
        * pci.ids: Added lots of subsystem definitions.
 Thu Oct 14 10:40:12 1999  Dave Jones    <dave@powertweak.com>
 
        * pci.ids: Added lots of subsystem definitions.

diff --git a/Makefile b/Makefile
index 3e75e1e510eb4211e148d5a9bac0e89f31ae9ba2..2b2811054102968d5de6c8d2a468845cb9169441 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.24 1999/10/15 08:43:45 mj Exp $
+# $Id: Makefile,v 1.25 1999/10/30 09:25:09 mj Exp $

 # Makefile for Linux PCI Utilities
 # (c) 1998--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 
 # Makefile for Linux PCI Utilities
 # (c) 1998--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 


@@ -6,10 +6,10 @@ OPT=-O2 -fomit-frame-pointer
 #OPT=-O2 -g
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Werror
 
 #OPT=-O2 -g
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Werror
 

-VERSION=2.1-pre8
+VERSION=2.1

 SUFFIX=
 #SUFFIX=-alpha
 SUFFIX=
 #SUFFIX=-alpha

-DATE=1999-10-15
+DATE=1999-10-30

 
 ifeq ($(shell uname),FreeBSD)
 ROOT=/usr/local
 
 ifeq ($(shell uname),FreeBSD)
 ROOT=/usr/local

diff --git a/pci.ids b/pci.ids
index fdf4ce8ac3ef8ff873860de09c34dac8227e6942..1338ec116cd3ef3ff4223ad6a7791596526d98dc 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -4,7 +4,7 @@
 #      Maintained by Martin Mares <pci-ids@ucw.cz>
 #      If you have any new entries, send them to the maintainer.
 #
 #      Maintained by Martin Mares <pci-ids@ucw.cz>
 #      If you have any new entries, send them to the maintainer.
 #

-#      $Id: pci.ids,v 1.40 1999/10/28 17:44:51 mj Exp $
+#      $Id: pci.ids,v 1.41 1999/10/30 09:25:10 mj Exp $

 #
 
 # Vendors, devices and subsystems. Please keep sorted.
 #
 
 # Vendors, devices and subsystems. Please keep sorted.


@@ -906,7 +906,15 @@
        88f1  Stealth 64
        9999  DMD-I0928-1 "Monster sound" sound chip
 1093  National Instruments
        88f1  Stealth 64
        9999  DMD-I0928-1 "Monster sound" sound chip
 1093  National Instruments

-       c801  PCI_GPIB
+       0160  PCI-DIO-96
+       0162  PCI-MIO-16XE-50
+       1170  PCI-MIO-16XE-10
+       1180  PCI-MIO-16E-1
+       1190  PCI-MIO-16E-4
+       1330  PCI-6031E
+       1350  PCI-6071E
+       2a60  PCI-6023E
+       c801  PCI-GPIB

 1094  First International Computers [FIC]
 1095  CMD Technology Inc
        0640  PCI0640
 1094  First International Computers [FIC]
 1095  CMD Technology Inc
        0640  PCI0640


@@ -1315,7 +1323,7 @@
        0597  VT82C597 [Apollo VP3]
        0598  VT82C598 [Apollo MVP3]
        0680  VT82C680 [Apollo P6]
        0597  VT82C597 [Apollo VP3]
        0598  VT82C598 [Apollo MVP3]
        0680  VT82C680 [Apollo P6]

-       0686  VT82C686 [Appolo Super]
+       0686  VT82C686 [Apollo Super]

        0691  VT82C691 [Apollo PRO]
        0693  VT82C693 [Apollo Pro Plus]
        0926  VT82C926 [Amazon]
        0691  VT82C691 [Apollo PRO]
        0693  VT82C693 [Apollo Pro Plus]
        0926  VT82C926 [Amazon]


@@ -1380,6 +1388,13 @@
 1114  Atmel Corporation
 1115  3D Labs
 1116  Data Translation
 1114  Atmel Corporation
 1115  3D Labs
 1116  Data Translation

+       0022  DT3001
+       0023  DT3002
+       0024  DT3003
+       0028  DT3003-PGL
+       0025  DT3004
+       0026  DT3005
+       0027  DT3001-PGL

 1117  Datacube, Inc
        9500  Max-1C SVGA card
        9501  Max-1C image processing
 1117  Datacube, Inc
        9500  Max-1C SVGA card
        9501  Max-1C image processing


@@ -2668,6 +2683,7 @@
        8000  Lava Parallel
        8002  Lava Dual Parallel port A
        8003  Lava Dual Parallel port B
        8000  Lava Parallel
        8002  Lava Dual Parallel port A
        8003  Lava Dual Parallel port B

+       8800  BOCA Research IOPPAR

 1408  Aloka Co. Ltd
 1409  Timedia Technology Co Ltd
 140a  DSP Research Inc
 1408  Aloka Co. Ltd
 1409  Timedia Technology Co Ltd
 140a  DSP Research Inc

diff --git a/pciutils.lsm b/pciutils.lsm
index 7007aa4339e7d08fc9514424a17953021d8309b1..b424f453dc6ae82ee048969d4a0b76693a698392 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title:          Linux PCI Utilities
 Begin3
 Title:          Linux PCI Utilities

-Version:        2.0
-Entered-date:   990519
+Version:        2.1
+Entered-date:   991030

 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus. Requires
                kernel version 2.1.82 or newer (supporting the /proc/bus/pci
 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus. Requires
                kernel version 2.1.82 or newer (supporting the /proc/bus/pci


@@ -9,7 +9,7 @@ Description:    This package contains various utilities for inspecting and
 Keywords:       kernel, pci, proc, lspci, setpci
 Author:         mj@atrey.karlin.mff.cuni.cz (Martin Mares)
 Maintained-by:  mj@atrey.karlin.mff.cuni.cz (Martin Mares)
 Keywords:       kernel, pci, proc, lspci, setpci
 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/linux/pci/pciutils-2.0.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.0.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.tar.gz

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/pciutils.spec b/pciutils.spec
index cf2c1eeb689225525f99c2b95b4c7bb53eb87a05..132fec160f20c3f7530e55d215a2243395971612 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,5 +1,5 @@
 Name:          pciutils
 Name:          pciutils

-Version:       2.0
+Version:       2.1

 Release:       1
 Source:                ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:     GNU GPL
 Release:       1
 Source:                ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:     GNU GPL