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

Some cards we identify as InterLAN cards do not seem to have the MAC 

address in the configuration ROM.  For these, fall back to the old method
if we can't find the expected sResource record.
This commit is contained in:
scottr 1997-03-17 20:26:01 +00:00
parent 08f7a407f9
commit 52348e9646
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/mac68k/dev/if_ae_nubus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ae_nubus.c,v 1.8 1997/03/15 18:33:46 scottr Exp $ */
/* $NetBSD: if_ae_nubus.c,v 1.9 1997/03/17 20:26:01 scottr Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@ -260,17 +260,13 @@ ae_nubus_attach(parent, self, aux)
/* reset the NIC chip */
bus_space_write_1(bst, bsh, GC_RESET_OFFSET, 0);
#ifdef AE_OLD_GET_ENADDR
/* Get station address from on-board ROM */
if (ae_nb_get_enaddr(na, sc->sc_arpcom.ac_enaddr)) {
/* Fall back to snarf directly from ROM. Ick. */
for (i = 0; i < ETHER_ADDR_LEN; ++i)
myaddr[i] =
bus_space_read_1(bst, bsh, (GC_ROM_OFFSET + i * 4));
#else
if (ae_nb_get_enaddr(na, myaddr)) {
printf(": can't find MAC address\n");
break;
bus_space_read_1(bst, bsh,
(GC_ROM_OFFSET + i * 4));
}
#endif
success = 1;
break;

14
sys/arch/mac68k/nubus/if_ae_nubus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ae_nubus.c,v 1.8 1997/03/15 18:33:46 scottr Exp $ */
/* $NetBSD: if_ae_nubus.c,v 1.9 1997/03/17 20:26:01 scottr Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@ -260,17 +260,13 @@ ae_nubus_attach(parent, self, aux)
/* reset the NIC chip */
bus_space_write_1(bst, bsh, GC_RESET_OFFSET, 0);
#ifdef AE_OLD_GET_ENADDR
/* Get station address from on-board ROM */
if (ae_nb_get_enaddr(na, sc->sc_arpcom.ac_enaddr)) {
/* Fall back to snarf directly from ROM. Ick. */
for (i = 0; i < ETHER_ADDR_LEN; ++i)
myaddr[i] =
bus_space_read_1(bst, bsh, (GC_ROM_OFFSET + i * 4));
#else
if (ae_nb_get_enaddr(na, myaddr)) {
printf(": can't find MAC address\n");
break;
bus_space_read_1(bst, bsh,
(GC_ROM_OFFSET + i * 4));
}
#endif
success = 1;
break;