[src/trunk]: src/sys/dev/pci fix description of Intel PRO/100 VM Network Cont...

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

details:   https://anonhg.NetBSD.org/src/rev/0e0800f7a2fb
branches:  trunk
changeset: 551867:0e0800f7a2fb
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Sep 13 12:13:29 2003 +0000

description:
fix description of Intel PRO/100 VM Network Controller with 82562ET/EZ PHY
don't activate any quirks for VM_6 variant
problem reported by Lars Heidieker on current-users

also don't activate any quirks for VM_3 - VM_5 variants, neither
VE_2 - VE_4, in anticipation that the more modern variants don't need
the quirks

diffstat:

 sys/dev/pci/if_fxp_pci.c |  25 +++++++++++++++++--------
 sys/dev/pci/pcidevs      |   4 ++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r 9c6380f54a3d -r 0e0800f7a2fb sys/dev/pci/if_fxp_pci.c
--- a/sys/dev/pci/if_fxp_pci.c  Sat Sep 13 11:16:28 2003 +0000
+++ b/sys/dev/pci/if_fxp_pci.c  Sat Sep 13 12:13:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_pci.c,v 1.35 2003/08/14 07:59:39 nonaka Exp $   */
+/*     $NetBSD: if_fxp_pci.c,v 1.36 2003/09/13 12:13:30 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.35 2003/08/14 07:59:39 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.36 2003/09/13 12:13:30 jdolecek Exp $");
 
 #include "rnd.h"
 
@@ -104,7 +104,7 @@
 CFATTACH_DECL(fxp_pci, sizeof(struct fxp_pci_softc),
     fxp_pci_match, fxp_pci_attach, NULL, NULL);
 
-const struct fxp_pci_product {
+static const struct fxp_pci_product {
        u_int32_t       fpp_prodid;     /* PCI product ID */
        const char      *fpp_name;      /* device name */
 } fxp_pci_products[] = {
@@ -143,7 +143,7 @@
        { PCI_PRODUCT_INTEL_PRO_100_VM_5,
          "Intel PRO/100 VM (MOB) Network Controller" },
        { PCI_PRODUCT_INTEL_PRO_100_VM_6,
-         "Intel PRO/100 VM Network Controller with 82562ET PHY" },
+         "Intel PRO/100 VM Network Controller with 82562ET/EZ PHY" },
        { PCI_PRODUCT_INTEL_PRO_100_M,
          "Intel PRO/100 M Network Controller" },
        { 0,
@@ -381,10 +381,6 @@
        case PCI_PRODUCT_INTEL_82562EH_HPNA_1:
        case PCI_PRODUCT_INTEL_82562EH_HPNA_2:
        case PCI_PRODUCT_INTEL_PRO_100_VM_2:
-       case PCI_PRODUCT_INTEL_PRO_100_VM_3:
-       case PCI_PRODUCT_INTEL_PRO_100_VM_4:
-       case PCI_PRODUCT_INTEL_PRO_100_VM_5:
-       case PCI_PRODUCT_INTEL_PRO_100_VM_6:
                aprint_normal(": %s, rev %d\n", fpp->fpp_name, sc->sc_rev);
 
                /*
@@ -404,6 +400,19 @@
                 *  in detail
                 */
                break;
+       case PCI_PRODUCT_INTEL_PRO_100_VE_2:
+       case PCI_PRODUCT_INTEL_PRO_100_VE_3:
+       case PCI_PRODUCT_INTEL_PRO_100_VE_4:
+       case PCI_PRODUCT_INTEL_PRO_100_VM_3:
+       case PCI_PRODUCT_INTEL_PRO_100_VM_4:
+       case PCI_PRODUCT_INTEL_PRO_100_VM_5:
+       case PCI_PRODUCT_INTEL_PRO_100_VM_6:
+               aprint_normal(": %s, rev %d\n", fpp->fpp_name, sc->sc_rev);
+               
+               /*
+                * No particular quirks.
+                */
+               break;
        }
 
        /* Make sure bus-mastering is enabled. */
diff -r 9c6380f54a3d -r 0e0800f7a2fb sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Sat Sep 13 11:16:28 2003 +0000
+++ b/sys/dev/pci/pcidevs       Sat Sep 13 12:13:29 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.573 2003/08/28 15:17:54 thorpej Exp $
+$NetBSD: pcidevs,v 1.574 2003/09/13 12:13:29 jdolecek Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1487,7 +1487,7 @@
 product INTEL PRO_100_VE_4     0x103d  PRO/100 VE (MOB) Network Controller
 product INTEL PRO_100_VM_5     0x103e  PRO/100 VM (MOB) Network Controller
 product INTEL PRO_WL_2100      0x1043  PRO/Wireless LAN 2100 3B Mini PCI Adapter
-product INTEL PRO_100_VM_6     0x1050  PRO/100 VM Network Controller with 82562ET PHY
+product INTEL PRO_100_VM_6     0x1050  PRO/100 VM Network Controller with 82562ET/EZ PHY
 product INTEL PRO_100_M                0x1059  PRO/100 M Network Controller
 product INTEL 82815_DC100_HUB  0x1100  82815 Hub
 product INTEL 82815_DC100_AGP  0x1101  82815 AGP