[src/netbsd-1-5]: src/sys/dev/pci Pull up revisions 1.3-1.4 (requested by som...

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

details:   https://anonhg.NetBSD.org/src/rev/d6d5cd3c545f
branches:  netbsd-1-5
changeset: 490938:d6d5cd3c545f
user:      he <he%NetBSD.org@localhost>
date:      Thu Mar 22 01:53:00 2001 +0000

description:
Pull up revisions 1.3-1.4 (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/pucvar.h |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r 1fd778dd93dd -r d6d5cd3c545f sys/dev/pci/pucvar.h
--- a/sys/dev/pci/pucvar.h      Thu Mar 22 01:52:40 2001 +0000
+++ b/sys/dev/pci/pucvar.h      Thu Mar 22 01:53:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pucvar.h,v 1.2 1999/02/06 06:29:54 cgd Exp $   */
+/*     $NetBSD: pucvar.h,v 1.2.18.1 2001/03/22 01:53:00 he Exp $       */
 
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
@@ -47,6 +47,7 @@
                int     type;
                int     bar;
                int     offset;
+               int     flags;
        }                       ports[PUC_MAX_PORTS];
 };
 
@@ -63,9 +64,17 @@
   ((port) < PUC_MAX_PORTS && (desc)->ports[(port)].type != PUC_PORT_TYPE_NONE)
 #define PUC_PORT_BAR_INDEX(bar)        (((bar) - PCI_MAPREG_START) / 4)
 
+/* Flags for PUC_PORT_TYPE_COM */
+/* * assume all clock rates have 8 lower bits to 0 - this leaves us 8 flags */
+#define PUC_COM_CLOCKMASK 0xffffff00
+
+/* Flags for PUC_PORT_TYPE_LPT */
+/* none currently */
+
 struct puc_attach_args {
        int                     port;
        int                     type;
+       int                     flags;
 
        pci_chipset_tag_t       pc;
        pci_intr_handle_t       intrhandle;
@@ -76,3 +85,5 @@
 };
 
 extern const struct puc_device_description puc_devices[];
+extern const struct puc_device_description *
+       puc_find_description __P((pcireg_t, pcireg_t, pcireg_t, pcireg_t));