Some new ID's and German description in the spec file.

Released as 2.1.7.

diff --git a/ChangeLog b/ChangeLog
index 3f6ce6b02cbc7e2586363baaae628363bba013f1..7b130adce331b6f6d2f5cb8c856ef41c2eb7b766 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2000-04-21  Martin Mares  <mj@albireo.ucw.cz>
+
+       * Released as 2.1.7.
+
+       * pciutils.spec: Added German description.
+
+       * lib/names.c (pci_lookup_name): Added a cheat for case that subsystem ID's
+       are the same as device ID and just output subsystem name according to
+       device name.
+
+       * lib/proc.c: Use UNUSED instead of __attribute__((unused)).
+
+       * lib/pci.h: Added the correct typedefs for AIX.
+
+       * lib/generic.c (pci_generic_scan_bus): Export.
+
+       * lib/configure: Detect AIX. Use "echo '...\c'" instead of
+       "echo -n" if the shell isn't bash.
+
+       * lspci.c: Avoid using alloca() if not compiled by GCC.
+       (insert_dev): Avoid returning a void value.
+
+       * Makefile: Choose which install utility to use according to
+       OS type. Also use `-o' instead of `-or' in find arguments.
+       Part of the AIX port.
+
+       * lib/aix-device.c: Added AIX low-level interface. Contributed
+       by Dave Johnson <ddj@brown.edu>, thanks a lot!
+
+       * pci.ids: Few new ID's.
+
+       * pciutils.h, lib/internal.h: Redefine __attribute__ and inline
+       when not compiled by GCC.
+

 2000-04-17  Martin Mares  <mj@albireo.ucw.cz>
 
        * Released as 2.1.6.
 2000-04-17  Martin Mares  <mj@albireo.ucw.cz>
 
        * Released as 2.1.6.

diff --git a/README b/README
index 2604d10f1a3f09e85c34327f8162e72effb7b147..ce106b1792e362b026a93e4746640f350f1a6fcf 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This package contains the PCI Utilities, version 2.1.5.
+This package contains the PCI Utilities, version 2.1.7.

 
 Copyright (c) 1997--2000 Martin Mares <mj@suse.cz>
 
 
 Copyright (c) 1997--2000 Martin Mares <mj@suse.cz>
 

diff --git a/pci.ids b/pci.ids
index 35fc7adca28cc82f14297b76aef4507a450f7e26..5551dbcb39a55f20776347ab62f1bff11a1507a8 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.56 2000/04/17 16:11:58 mj Exp $
+#      $Id: pci.ids,v 1.57 2000/04/21 12:00:12 mj Exp $

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


@@ -315,7 +315,8 @@
        0046  DECchip 21554
                9005 1364  Dell PowerEdge RAID Controller 2
                9005 1365  Dell PowerEdge RAID Controller 2
        0046  DECchip 21554
                9005 1364  Dell PowerEdge RAID Controller 2
                9005 1365  Dell PowerEdge RAID Controller 2

-       1065  RAID Controller
+       1065  DECchip 21285
+               1069 0020  DAC960P

 1012  Micronics Computers Inc
 1013  Cirrus Logic
        0038  GD 7548
 1012  Micronics Computers Inc
 1013  Cirrus Logic
        0038  GD 7548


@@ -372,6 +373,7 @@
        002d  Python
        002e  ServeRAID controller
        0036  Miami
        002d  Python
        002e  ServeRAID controller
        0036  Miami

+       003a  CPU to PCI Bridge

        003e  16/4 Token ring UTP/STP controller
                1014 003e  Token-Ring Adapter
                1014 00cd  Token-Ring Adapter + Wake-On-LAN
        003e  16/4 Token ring UTP/STP controller
                1014 003e  Token-Ring Adapter
                1014 00cd  Token-Ring Adapter + Wake-On-LAN


@@ -379,16 +381,30 @@
                1014 00cf  16/4 Token-Ring Adapter Special
                1014 00e4  High-Speed 100/16/4 Token-Ring Adapter
                1014 00e5  16/4 Token-Ring Adapter 2 + Wake-On-LAN
                1014 00cf  16/4 Token-Ring Adapter Special
                1014 00e4  High-Speed 100/16/4 Token-Ring Adapter
                1014 00e5  16/4 Token-Ring Adapter 2 + Wake-On-LAN

+       0045  SSA Adapter

        0046  MPIC interrupt controller
        0047  PCI to PCI Bridge
        0048  PCI to PCI Bridge
        0046  MPIC interrupt controller
        0047  PCI to PCI Bridge
        0048  PCI to PCI Bridge

+       004e  ATM Controller (14104e00)
+       004f  ATM Controller (14104f00)
+       0050  ATM Controller (14105000)

        0053  25 MBit ATM Controller
        0057  MPEG PCI Bridge
        005c  i82557B 10/100
        0053  25 MBit ATM Controller
        0057  MPEG PCI Bridge
        005c  i82557B 10/100

+       007c  ATM Controller (14107c00)

        007d  3780IDSP [MWave]
        007d  3780IDSP [MWave]

+       0090  GXT 3000P
+               1014 008E  GXT-3000P

        0095  20H2999 PCI Docking Bridge
        0095  20H2999 PCI Docking Bridge

+       00a5  ATM Controller (1410a500)
+       00a6  ATM 155MBPS MM Controller (1410a600)

        00b7  256-bit Graphics Rasterizer [Fire GL1]
                1902 00b8  Fire GL1
        00b7  256-bit Graphics Rasterizer [Fire GL1]
                1902 00b8  Fire GL1

+       00be  ATM 622MBPS Controller (1410be00)
+       0142  Yotta Video Compositor Input
+               1014 0143 Yotta Input Controller (ytin)
+       0144  Yotta Video Compositor Output
+               1014 0145 Yotta Output Controller (ytout)

        ffff  MPIC-2 interrupt controller
 1015  LSI Logic Corp of Canada
 1016  ICL Personal Systems
        ffff  MPIC-2 interrupt controller
 1015  LSI Logic Corp of Canada
 1016  ICL Personal Systems


@@ -2488,7 +2504,7 @@
        0458  LT WinModem
        0459  LT WinModem
        045a  LT WinModem
        0458  LT WinModem
        0459  LT WinModem
        045a  LT WinModem

-       0480  Venus WinModem (V90, 56KFlex)
+       0480  Venus Modem (V90, 56KFlex)

 11c2  Sand Microelectronics
 11c3  NEC Corp
 11c4  Document Technologies, Inc
 11c2  Sand Microelectronics
 11c3  NEC Corp
 11c4  Document Technologies, Inc


@@ -2657,7 +2673,7 @@
                139c 0017  Raven
                14af 0002  Maxi Gamer Phoenix
                3030 3030  Skywell Magic TwinPower
                139c 0017  Raven
                14af 0002  Maxi Gamer Phoenix
                3030 3030  Skywell Magic TwinPower

-       0004  Voodoo Banshee
+       0004  Voodoo Banshee [Velocity 100]

        0005  Voodoo 3
                121a 0004  Voodoo3 AGP
                121a 0030  Voodoo3 AGP
        0005  Voodoo 3
                121a 0004  Voodoo3 AGP
                121a 0030  Voodoo3 AGP


@@ -3006,6 +3022,7 @@
 12ad  Multidata GmbH
 12ae  Alteon Networks Inc.
        0001  AceNIC Gigabit Ethernet
 12ad  Multidata GmbH
 12ae  Alteon Networks Inc.
        0001  AceNIC Gigabit Ethernet

+               1410 0104  Gigabit Ethernet-SX PCI Adapter (14100401)

 12af  TDK USA Corp
 12b0  Jorge Scientific Corp
 12b1  GammaLink
 12af  TDK USA Corp
 12b0  Jorge Scientific Corp
 12b1  GammaLink


@@ -4195,6 +4212,8 @@
 45fb  Baldor Electric Company
 4680  Umax Computer Corp
 4843  Hercules Computer Technology Inc
 45fb  Baldor Electric Company
 4680  Umax Computer Corp
 4843  Hercules Computer Technology Inc

+4916  RedCreek Communications Inc
+       1960  RedCreek PCI adapter

 4943  Growth Networks
 4978  Axil Computer Inc
 4a14  NetVin
 4943  Growth Networks
 4978  Axil Computer Inc
 4a14  NetVin

diff --git a/pciutils.lsm b/pciutils.lsm
index 0bbea0155724405636f12ae2626dc04198b9bbc9..9a7758a150ae96de48704e30fdc7c4e9410ea419 100644 (file)
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,13 +1,13 @@
 Begin3
 Title:          Linux PCI Utilities
 Begin3
 Title:          Linux PCI Utilities

-Version:        2.1.5
-Entered-date:   000215
+Version:        2.1.7
+Entered-date:   000421

 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus.
 Keywords:       kernel, pci, lspci, setpci, libpci
 Author:         mj@suse.cz (Martin Mares)
 Maintained-by:  mj@suse.cz (Martin Mares)
 Description:    This package contains various utilities for inspecting and
                setting of devices connected to the PCI bus.
 Keywords:       kernel, pci, lspci, setpci, libpci
 Author:         mj@suse.cz (Martin Mares)
 Maintained-by:  mj@suse.cz (Martin Mares)

-Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.5.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.5.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.7.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.7.tar.gz

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

diff --git a/pciutils.spec b/pciutils.spec
index 3e980308e7fbf55275f1f378feb24d54979d1833..05bdb95a7de7d4a071ff65289114d04396113b31 100644 (file)
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,5 +1,5 @@
 Name:          pciutils
 Name:          pciutils

-Version:       2.1.5
+Version:       2.1.7

 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


@@ -20,6 +20,12 @@ o urz
 Wymaga kernela 2.1.82 lub nowszego (udostêpniaj±cego odpowiednie
 informacje poprzez /proc/bus/pci).
 
 Wymaga kernela 2.1.82 lub nowszego (udostêpniaj±cego odpowiednie
 informacje poprzez /proc/bus/pci).
 

+%description -l de
+Dieses Paket enthält verschiedene Programme zum Anzeigen und
+Einstellen von PCI-Bus Erweiterungen.  Benötigt wird ein Kernel
+Version 2.1.82 oder neuer (mit Unterstützung für die /proc/bus/pci
+Schnittstelle).
+

 %prep
 %setup -q
 
 %prep
 %setup -q