[src/netbsd-1-5]: src/sys/dev/pci Pull up revisions 1.10-1.11 (requested by s...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1fd778dd93dd
branches:  netbsd-1-5
changeset: 490937:1fd778dd93dd
user:      he <he%NetBSD.org@localhost>
date:      Thu Mar 22 01:52:40 2001 +0000

description:
Pull up revisions 1.10-1.11 (requested by sommerfeld):
  Add support for NetMos NM9835, Titan PCI-800H, Lava 8-port,
  Actiontec 56K PCI Master.  This also adds a ``flags'' member
  to two structs in this driver.

diffstat:

 sys/dev/pci/puc.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r b848fb58d9d6 -r 1fd778dd93dd sys/dev/pci/puc.c
--- a/sys/dev/pci/puc.c Tue Mar 20 18:43:39 2001 +0000
+++ b/sys/dev/pci/puc.c Thu Mar 22 01:52:40 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puc.c,v 1.4 2000/04/17 16:45:04 cgd Exp $      */
+/*     $NetBSD: puc.c,v 1.4.4.1 2001/03/22 01:52:40 he Exp $   */
 
 /*
  * Copyright (c) 1996, 1998, 1999
@@ -131,9 +131,13 @@
         * Match class/subclass, so we can tell people to compile kernel
         * with options that cause this driver to spew.
         */
-       if (PCI_CLASS(pa->pa_class) == PCI_CLASS_COMMUNICATIONS &&
-           PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_PCI)
-               return (1);
+       if (PCI_CLASS(pa->pa_class) == PCI_CLASS_COMMUNICATIONS) {
+               switch (PCI_SUBCLASS(pa->pa_class)) {
+               case PCI_SUBCLASS_COMMUNICATIONS_SERIAL:
+               case PCI_SUBCLASS_COMMUNICATIONS_MODEM:
+                       return (1);
+               }
+       }
 #endif
 
        return (0);
@@ -257,6 +261,7 @@
                /* set up to configure the child device */
                paa.port = i;
                paa.type = sc->sc_desc->ports[i].type;
+               paa.flags = sc->sc_desc->ports[i].flags;
                paa.pc = pa->pa_pc;
                paa.intrhandle = intrhandle;
                paa.a = sc->sc_bar_mappings[barindex].a;