Fixed a couple of bugs in the AIX port and added several new ID's.

diff --git a/ChangeLog b/ChangeLog
index 7b130adce331b6f6d2f5cb8c856ef41c2eb7b766..4568fc8f0366d06193323c8bb07904c23dad0cd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-29  Martin Mares  <mj@albireo.ucw.cz>
+
+       * lib/names.c (pci_lookup_name): Fixed the cheat.
+
+       * lib/internal.h: Moved UNUSED/inline hacks above all other declarations.
+
+       * pci.ids: Various ID updates.
+
 2000-04-21  Martin Mares  <mj@albireo.ucw.cz>
 
        * Released as 2.1.7.

diff --git a/lib/internal.h b/lib/internal.h
index ff86b2d4774337ee6956a0ec19b9aa9d69008f20..0a786c103b9ad619d228541b1ce45dc31cf48f63 100644 (file)
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -1,15 +1,22 @@
 /*
- *     $Id: internal.h,v 1.4 2000/04/21 11:58:00 mj Exp $
+ *     $Id: internal.h,v 1.5 2000/04/29 12:56:23 mj Exp $
  *
  *     The PCI Library -- Internal Include File
  *
- *     Copyright (c) 1997--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997--2000 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
 
 #include "pci.h"
 
+#ifdef __GNUC__
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#define inline
+#endif
+
 #ifdef HAVE_PM_LINUX_BYTEORDER_H
 
 #include <asm/byteorder.h>
@@ -85,10 +92,3 @@ int pci_link_dev(struct pci_access *, struct pci_dev *);
 
 extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_linux_proc,
   pm_syscalls, pm_fbsd_device, pm_aix_device, pm_dump;
-
-#ifdef __GNUC__
-#define UNUSED __attribute__((unused))
-#else
-#define UNUSED
-#define inline
-#endif

diff --git a/lib/names.c b/lib/names.c
index 4511f93508eedbdb6816d8e1372fbcf3b7993d84..704013f410c8fb9f5c9549192f68b6901debe6f4 100644 (file)
--- a/lib/names.c
+++ b/lib/names.c
@@ -1,9 +1,9 @@
 /*
- *     $Id: names.c,v 1.5 2000/04/21 11:58:48 mj Exp $
+ *     $Id: names.c,v 1.6 2000/04/29 12:56:23 mj Exp $
  *
  *     The PCI Library -- ID to Name Translation
  *
- *     Copyright (c) 1997--1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ *     Copyright (c) 1997--2000 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -300,7 +300,7 @@ pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, u32 arg1,
          struct nl_entry *e, *e2;
          e = nl_lookup(a, 0, NL_VENDOR, arg3, 0, 0, 0);
          e2 = nl_lookup(a, 0, NL_SUBSYSTEM, arg1, arg2, arg3, arg4);
-         if (!e2 && arg1 == arg2 && arg3 == arg4)
+         if (!e2 && arg1 == arg3 && arg2 == arg4)
            /* Cheat for vendors blindly setting subsystem ID same as device ID */
            e2 = nl_lookup(a, 0, NL_DEVICE, arg1, arg2, 0, 0);
          if (!e)

diff --git a/pci.ids b/pci.ids
index 5551dbcb39a55f20776347ab62f1bff11a1507a8..c153e7d16459e7870de5f758b0e024a460c49287 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.
 #
-#      $Id: pci.ids,v 1.57 2000/04/21 12:00:12 mj Exp $
+#      $Id: pci.ids,v 1.58 2000/04/29 12:56:22 mj Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -315,7 +315,7 @@
        0046  DECchip 21554
                9005 1364  Dell PowerEdge RAID Controller 2
                9005 1365  Dell PowerEdge RAID Controller 2
-       1065  DECchip 21285
+       1065  StrongARM DC21285
                1069 0020  DAC960P
 1012  Micronics Computers Inc
 1013  Cirrus Logic
@@ -1403,6 +1403,7 @@
        1077  VScom 400 4 port serial adaptor
        9036  9036
        9050  PCI <-> IOBus Bridge
+               10b5 2273  SH-ARC SoHard ARCnet card
                d84d 4006  EX-4006 1P
                d84d 4008  EX-4008 1P EPP/ECP
                d84d 4014  EX-4014 2P
@@ -1461,6 +1462,7 @@
        5950  3c595 100BaseTX [Vortex]
        5951  3c595 100BaseT4 [Vortex]
        5952  3c595 100Base-MII [Vortex]
+       7646  SOHO100 [Office Connect Fast Etherlink]
        8811  Token ring
        9000  3c900 10BaseT [Boomerang]
        9001  3c900 Combo [Boomerang]
@@ -2406,6 +2408,7 @@
 11ae  Aztech System Ltd
 11af  Avid Technology Inc.
 11b0  V3 Semiconductor Inc.
+       0002  V300PSC
        0292  V292PBC [Am29030/40 Bridge]
        0960  V96xPBC
        c960  V96DPC
@@ -4137,8 +4140,6 @@
 1b13  Jaton Corp
 1c1c  Symphony
        0001  82C101
-1d44  DPT
-       a400  PM2x24/PM3224
 1de1  Tekram Technology Co.,Ltd.
        0391  TRM-S1040
        2020  DC-390