Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For sparc*: myetheraddr is no more

This commit is contained in:
martin 2004-03-17 13:54:09 +00:00
parent da415e73f9
commit fde39f7603
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/pci/if_gem_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gem_pci.c,v 1.14 2003/01/31 00:07:43 thorpej Exp $ */
/* $NetBSD: if_gem_pci.c,v 1.15 2004/03/17 13:54:09 martin Exp $ */
/*
*
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.14 2003/01/31 00:07:43 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.15 2004/03/17 13:54:09 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -75,6 +75,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.14 2003/01/31 00:07:43 thorpej Exp
#ifdef macppc
#include <dev/ofw/openfirm.h>
#endif /* macppc */
#ifdef __sparc__
#include <machine/promlib.h>
#endif
struct gem_pci_softc {
struct gem_softc gsc_gem; /* GEM device */
@ -164,8 +167,7 @@ gem_attach_pci(parent, self, aux)
*/
#ifdef __sparc__
{
extern void myetheraddr __P((u_char *));
myetheraddr(enaddr);
prom_getether(PCITAG_NODE(pa->pa_tag), enaddr);
}
#endif /* __sparc__ */
#ifdef macppc

10
sys/dev/pci/if_tlp_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tlp_pci.c,v 1.75 2003/11/28 06:03:09 cube Exp $ */
/* $NetBSD: if_tlp_pci.c,v 1.76 2004/03/17 13:54:09 martin 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.75 2003/11/28 06:03:09 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.76 2004/03/17 13:54:09 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -64,6 +64,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.75 2003/11/28 06:03:09 cube Exp $")
#include <machine/bus.h>
#include <machine/intr.h>
#ifdef __sparc__
#include <machine/promlib.h>
#endif
#include <dev/mii/miivar.h>
#include <dev/mii/mii_bitbang.h>
@ -924,8 +927,7 @@ tlp_pci_attach(parent, self, aux)
#ifdef __sparc__
if (!sc->sc_srom[20] && !sc->sc_srom[21] &&
!sc->sc_srom[22]) {
extern void myetheraddr __P((u_char *));
myetheraddr(enaddr);
prom_getether(PCITAG_NODE(pa->pa_tag), enaddr);
} else
#endif
memcpy(enaddr, &sc->sc_srom[20], ETHER_ADDR_LEN);