[src/netbsd-1-5]: src/sys/dev/pci defopt TLP_MATCH_*. pullup approved by tho...

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

details:   https://anonhg.NetBSD.org/src/rev/712f9f27f63e
branches:  netbsd-1-5
changeset: 488258:712f9f27f63e
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Jun 25 20:23:35 2000 +0000

description:
defopt TLP_MATCH_*.  pullup approved by thorpej

diffstat:

 sys/dev/pci/files.pci    |  9 +++++++--
 sys/dev/pci/if_tlp_pci.c |  3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 31a1adfc5354 -r 712f9f27f63e sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Sun Jun 25 17:10:25 2000 +0000
+++ b/sys/dev/pci/files.pci     Sun Jun 25 20:23:35 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.96 2000/06/06 03:07:39 thorpej Exp $
+#      $NetBSD: files.pci,v 1.96.2.1 2000/06/25 20:23:35 sommerfeld Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -292,6 +292,11 @@
 
 # DECchip 21x4x Ethernet controller family, and assorted clones.
 attach tlp at pci with tlp_pci
+defopt opt_tlp.h                       TLP_MATCH_21040
+                                       TLP_MATCH_21041
+                                       TLP_MATCH_21140
+                                       TLP_MATCH_21142
+
 file   dev/pci/if_tlp_pci.c            tlp_pci
 
 # Bit3 PCI-VME mod. 617
@@ -331,6 +336,6 @@
 file dev/pci/viapm.c   viapm
 
 # hardware monitoring part of viapm
-device viaenv
+device viaenv: sysmon
 attach viaenv at viapm
 file dev/pci/viaenv.c  viaenv needs-flag
diff -r 31a1adfc5354 -r 712f9f27f63e sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Sun Jun 25 17:10:25 2000 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Sun Jun 25 20:23:35 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.39 2000/05/27 19:42:06 thorpej Exp $  */
+/*     $NetBSD: if_tlp_pci.c,v 1.39.2.1 2000/06/25 20:23:36 sommerfeld Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -45,6 +45,7 @@
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include "bpfilter.h"
+#include "opt_tlp.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>