Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Remove TLP_MATCH_* options.



details:   https://anonhg.NetBSD.org/src/rev/e8d69826af5b
branches:  trunk
changeset: 525768:e8d69826af5b
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Apr 17 02:19:13 2002 +0000

description:
Remove TLP_MATCH_* options.

diffstat:

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

diffs (72 lines):

diff -r bde50d726077 -r e8d69826af5b sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Wed Apr 17 02:04:26 2002 +0000
+++ b/sys/dev/pci/files.pci     Wed Apr 17 02:19:13 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.166 2002/03/30 20:21:22 uwe Exp $
+#      $NetBSD: files.pci,v 1.167 2002/04/17 02:19:13 mycroft Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -452,9 +452,6 @@
 
 # DECchip 21x4x Ethernet controller family, and assorted clones.
 attach tlp at pci with tlp_pci
-defflag        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
diff -r bde50d726077 -r e8d69826af5b sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Wed Apr 17 02:04:26 2002 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Wed Apr 17 02:19:13 2002 +0000
@@ -1,12 +1,12 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.64 2002/04/04 05:45:55 chs Exp $      */
+/*     $NetBSD: if_tlp_pci.c,v 1.65 2002/04/17 02:19:14 mycroft Exp $  */
 
 /*-
- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
+ * NASA Ames Research Center; and Charles M. Hannum.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,9 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.64 2002/04/04 05:45:55 chs Exp $");
-
-#include "opt_tlp.h"
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.65 2002/04/17 02:19:14 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
@@ -123,22 +121,14 @@
        u_int32_t       tpp_product;    /* PCI product ID */
        tulip_chip_t    tpp_chip;       /* base Tulip chip type */
 } tlp_pci_products[] = {
-#ifdef TLP_MATCH_21040
        { PCI_VENDOR_DEC,               PCI_PRODUCT_DEC_21040,
          TULIP_CHIP_21040 },
-#endif
-#ifdef TLP_MATCH_21041
        { PCI_VENDOR_DEC,               PCI_PRODUCT_DEC_21041,
          TULIP_CHIP_21041 },
-#endif
-#ifdef TLP_MATCH_21140
        { PCI_VENDOR_DEC,               PCI_PRODUCT_DEC_21140,
          TULIP_CHIP_21140 },
-#endif
-#ifdef TLP_MATCH_21142
        { PCI_VENDOR_DEC,               PCI_PRODUCT_DEC_21142,
          TULIP_CHIP_21142 },
-#endif
 
        { PCI_VENDOR_LITEON,            PCI_PRODUCT_LITEON_82C168,
          TULIP_CHIP_82C168 },



Home | Main Index | Thread Index | Old Index