summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-12-11 22:38:37 +0000
committerMartin Mares <mj@ucw.cz>2006-05-05 14:10:18 +0200
commit0c047bbefa7dfe6e5084bbe460c8a859655863fe (patch)
tree4cd3ad90298e19a8ee5f4c06889a888668fc4b72
parent392312050cef0747ef6693b36798a527f950d7bf (diff)
downloadpciutils-0c047bbefa7dfe6e5084bbe460c8a859655863fe.tar.gz
Fixed printing of unknown subsystem ID's.
Released as 2.1.2.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile6
-rw-r--r--README2
-rw-r--r--lib/names.c6
-rw-r--r--pci.ids3
-rw-r--r--pciutils.lsm8
-rw-r--r--pciutils.spec2
7 files changed, 20 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index c58c79b..fa73384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 11 23:34:48 1999 Martin Mares <mj@albireo.ucw.cz>
+
+ * Released as version 2.1.2.
+
+ * lib/names.c (pci_lookup_name): Fixed printing of unknown subsystem ID's.
+
Sat Dec 4 13:11:03 1999 Martin Mares <mj@albireo.ucw.cz>
* Released as version 2.1.1.
diff --git a/Makefile b/Makefile
index b80fe73..a0ff83c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.26 1999/12/04 12:55:11 mj Exp $
+# $Id: Makefile,v 1.27 1999/12/11 22:38:39 mj Exp $
# 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
-VERSION=2.1.1
+VERSION=2.1.2
SUFFIX=
#SUFFIX=-alpha
-DATE=1999-12-04
+DATE=1999-12-11
ifeq ($(shell uname),FreeBSD)
ROOT=/usr/local
diff --git a/README b/README
index 489fa17..9b409b2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This package contains the PCI Utilities, version 2.1.1.
+This package contains the PCI Utilities, version 2.1.2.
Copyright (c) 1997--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
diff --git a/lib/names.c b/lib/names.c
index 8e39f75..a9bb620 100644
--- a/lib/names.c
+++ b/lib/names.c
@@ -1,5 +1,5 @@
/*
- * $Id: names.c,v 1.3 1999/10/09 13:26:12 mj Exp $
+ * $Id: names.c,v 1.4 1999/12/11 22:38:55 mj Exp $
*
* The PCI Library -- ID to Name Translation
*
@@ -299,9 +299,9 @@ pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, u32 arg1,
e = nl_lookup(a, 0, NL_VENDOR, arg3, 0, 0, 0);
e2 = nl_lookup(a, 0, NL_SUBSYSTEM, arg1, arg2, arg3, arg4);
if (!e)
- res = snprintf(buf, size, "Unknown device %04x:%04x", arg1, arg2);
+ res = snprintf(buf, size, "Unknown device %04x:%04x", arg3, arg4);
else if (!e2)
- res = snprintf(buf, size, "%s: Unknown device %04x", e->name, arg2);
+ res = snprintf(buf, size, "%s: Unknown device %04x", e->name, arg4);
else
res = snprintf(buf, size, "%s %s", e->name, e2->name);
}
diff --git a/pci.ids b/pci.ids
index df51939..1f1da24 100644
--- 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.
#
-# $Id: pci.ids,v 1.43 1999/12/04 12:32:55 mj Exp $
+# $Id: pci.ids,v 1.44 1999/12/11 22:38:43 mj Exp $
#
# Vendors, devices and subsystems. Please keep sorted.
@@ -2108,6 +2108,7 @@
8888 Cinemaster C 3.0 DVD Decoder
1240 Marathon Technologies Corp.
1241 DSC Communications
+1242 Jaycor Networks, Inc.
1243 Delphax
1244 AVM Audiovisuelles MKTG & Computer System GmbH
0700 B1 ISDN
diff --git a/pciutils.lsm b/pciutils.lsm
index 3fe5d7d..910c185 100644
--- a/pciutils.lsm
+++ b/pciutils.lsm
@@ -1,7 +1,7 @@
Begin3
Title: Linux PCI Utilities
-Version: 2.1.1
-Entered-date: 991204
+Version: 2.1.2
+Entered-date: 991211
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)
-Primary-site: atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.1.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.1.tar.gz
+Primary-site: atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.1.2.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.1.2.tar.gz
Copying-policy: GPL
End
diff --git a/pciutils.spec b/pciutils.spec
index c827578..d2319a6 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,5 +1,5 @@
Name: pciutils
-Version: 2.1.1
+Version: 2.1.2
Release: 1
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
Copyright: GNU GPL