[src/netbsd-1-5]: src/sys/dev/pci Pullup rev 1.9 (approved by jhawk), rev 1.1...

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

details:   https://anonhg.NetBSD.org/src/rev/c39f7ff38548
branches:  netbsd-1-5
changeset: 488537:c39f7ff38548
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun Jul 16 00:27:58 2000 +0000

description:
Pullup rev 1.9 (approved by jhawk), rev 1.10 (approved by thorpej):
revision 1.9:
  Recognize the i82559ER.
revision 1.10:
  Fix uninitialized variable (reg) in fxp_pci_confreg_restore();
  this could result in garbage being written to the PCI status register,
  which is unlikely to have had a serious effect. This was with us from
  an #if 0 added in rev 1.6.

diffstat:

 sys/dev/pci/if_fxp_pci.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r b8cd72efed88 -r c39f7ff38548 sys/dev/pci/if_fxp_pci.c
--- a/sys/dev/pci/if_fxp_pci.c  Sat Jul 15 22:48:01 2000 +0000
+++ b/sys/dev/pci/if_fxp_pci.c  Sun Jul 16 00:27:58 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_pci.c,v 1.8 2000/05/12 18:46:34 jhawk Exp $     */
+/*     $NetBSD: if_fxp_pci.c,v 1.8.4.1 2000/07/16 00:27:58 jhawk Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -119,6 +119,8 @@
 } fxp_pci_products[] = {
        { PCI_PRODUCT_INTEL_82557,
          "Intel i82557 Ethernet" },
+       { PCI_PRODUCT_INTEL_82559ER,
+         "Intel i82559ER Ethernet" },
        { PCI_PRODUCT_INTEL_IN_BUSINESS,
          "Intel InBusiness Ethernet" },
 
@@ -190,6 +192,8 @@
        if (((reg = pci_conf_read(psc->psc_pc, psc->psc_tag,
            PCI_COMMAND_STATUS_REG)) & 0xffff) != 0)
                return;
+#else
+       reg = pci_conf_read(psc->psc_pc, psc->psc_tag, PCI_COMMAND_STATUS_REG);
 #endif
 
        pci_conf_write(psc->psc_pc, psc->psc_tag,