diff options
| author | Hugh Graham <hugh@cvs.openbsd.org> | 2002-03-31 01:10:37 +0000 |
|---|---|---|
| committer | Hugh Graham <hugh@cvs.openbsd.org> | 2002-03-31 01:10:37 +0000 |
| commit | 74c92d6b635e2d2a718ed620e5d2b79ea40c2787 (patch) | |
| tree | e064e9067fb47d76a83c413bfc2d2c1af609bbd1 /sys/arch/vax | |
| parent | 2d660b02c2f54517093f4a7a554e4b051f1277a7 (diff) | |
Copy mac address from proper place on 4000 200. Spotted thanks to a
failed boot log from Jim Uhl.
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/boot/boot/if_ze.c | 7 | ||||
| -rw-r--r-- | sys/arch/vax/stand/boot/if_ze.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/vax/boot/boot/if_ze.c b/sys/arch/vax/boot/boot/if_ze.c index 20c93cd62f6..3f88decb7c6 100644 --- a/sys/arch/vax/boot/boot/if_ze.c +++ b/sys/arch/vax/boot/boot/if_ze.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ze.c,v 1.2 2001/04/01 17:19:48 hugh Exp $ */ +/* $OpenBSD: if_ze.c,v 1.3 2002/03/31 01:10:36 hugh Exp $ */ /* $NetBSD: if_ze.c,v 1.5 1999/08/23 19:09:27 ragge Exp $ */ /* * Copyright (c) 1998 James R. Maynard III. All rights reserved. @@ -127,7 +127,10 @@ ze_init(desc, machdep_hint) } else { nisa_rom = (u_long *)0x20084000; for (i=0; i<ETHER_ADDR_LEN; i++) - ze_myaddr[i] = (nisa_rom[i] & 0x0000ff00) >> 8; + if (vax_boardtype == VAX_BTYP_660) + ze_myaddr[i] = (nisa_rom[i] & 0xff000000) >> 24; + else + ze_myaddr[i] = (nisa_rom[i] & 0x0000ff00) >> 8; } bcopy(ze_myaddr,desc->myea,ETHER_ADDR_LEN); diff --git a/sys/arch/vax/stand/boot/if_ze.c b/sys/arch/vax/stand/boot/if_ze.c index 20c93cd62f6..3f88decb7c6 100644 --- a/sys/arch/vax/stand/boot/if_ze.c +++ b/sys/arch/vax/stand/boot/if_ze.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ze.c,v 1.2 2001/04/01 17:19:48 hugh Exp $ */ +/* $OpenBSD: if_ze.c,v 1.3 2002/03/31 01:10:36 hugh Exp $ */ /* $NetBSD: if_ze.c,v 1.5 1999/08/23 19:09:27 ragge Exp $ */ /* * Copyright (c) 1998 James R. Maynard III. All rights reserved. @@ -127,7 +127,10 @@ ze_init(desc, machdep_hint) } else { nisa_rom = (u_long *)0x20084000; for (i=0; i<ETHER_ADDR_LEN; i++) - ze_myaddr[i] = (nisa_rom[i] & 0x0000ff00) >> 8; + if (vax_boardtype == VAX_BTYP_660) + ze_myaddr[i] = (nisa_rom[i] & 0xff000000) >> 24; + else + ze_myaddr[i] = (nisa_rom[i] & 0x0000ff00) >> 8; } bcopy(ze_myaddr,desc->myea,ETHER_ADDR_LEN); |