[src/netbsd-3]: src/sys/dev/pci Pull up revision 1.79 (requested by tron in t...

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

details:   https://anonhg.NetBSD.org/src/rev/415f342840c4
branches:  netbsd-3
changeset: 576277:415f342840c4
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Jun 18 05:56:59 2005 +0000

description:
Pull up revision 1.79 (requested by tron in ticket #451):
Also use prom_getether() under NetBSD-sparc(64) if the MAC address
retrieved from the PROM starts with ff:ff:ff. The driver now works with
the onboard interface in the Tadpole SPARCle.

diffstat:

 sys/dev/pci/if_tlp_pci.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 896f5fa19be4 -r 415f342840c4 sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Sat Jun 18 05:33:41 2005 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Sat Jun 18 05:56:59 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.78 2005/02/27 00:27:33 perry Exp $    */
+/*     $NetBSD: if_tlp_pci.c,v 1.78.2.1 2005/06/18 05:56:59 riz Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.78 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.78.2.1 2005/06/18 05:56:59 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -909,8 +909,12 @@
                 */
                if (!tlp_isv_srom_enaddr(sc, enaddr)) {
 #ifdef __sparc__
-                       if (!sc->sc_srom[20] && !sc->sc_srom[21] &&
-                           !sc->sc_srom[22]) {
+                       if ((sc->sc_srom[20] == 0 &&
+                            sc->sc_srom[21] == 0 &&
+                            sc->sc_srom[22] == 0) ||
+                           (sc->sc_srom[20] == 0xff &&
+                            sc->sc_srom[21] == 0xff &&
+                            sc->sc_srom[22] == 0xff)) {
                                prom_getether(PCITAG_NODE(pa->pa_tag), enaddr);
                        } else
 #endif