summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugh Graham <hugh@cvs.openbsd.org>2001-05-20 14:19:44 +0000
committerHugh Graham <hugh@cvs.openbsd.org>2001-05-20 14:19:44 +0000
commite3a5258dd48d104c493f264a0efc830f4452e0d2 (patch)
tree72538cc1e8f00e5b4f952561448203e5b2d4af5a
parentfd2b06e75dd3d1ac2f7f45fe344e3e2aa577d724 (diff)
From NetBSD:
> date: 2000/05/08 18:51:17; author: ragge; state: Exp; lines: +6 -2 > branches: 1.4.2; > Get correct MAC address out of rom on VAX 4000/200. From Michael Kukat.
-rw-r--r--sys/arch/vax/if/if_ze.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/vax/if/if_ze.c b/sys/arch/vax/if/if_ze.c
index 66dbe4134a5..9421b1d786f 100644
--- a/sys/arch/vax/if/if_ze.c
+++ b/sys/arch/vax/if/if_ze.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ze.c,v 1.1 2000/04/27 03:14:43 bjc Exp $ */
+/* $OpenBSD: if_ze.c,v 1.2 2001/05/20 14:19:43 hugh Exp $ */
/* $NetBSD: if_ze.c,v 1.3 2000/01/24 02:54:03 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -50,6 +50,7 @@
#include <machine/nexus.h>
#include <machine/cpu.h>
#include <machine/scb.h>
+#include <machine/sid.h>
#include <arch/vax/if/sgecreg.h>
#include <arch/vax/if/sgecvar.h>
@@ -119,7 +120,11 @@ zeattach(parent, self, aux)
*/
ea = (int *)vax_map_physmem(NISA_ROM, 1);
for (i = 0; i < ETHER_ADDR_LEN; i++)
- sc->sc_ac.ac_enaddr[i] = (ea[i] >> 8) & 0377;
+ if (vax_boardtype == VAX_BTYP_660)
+ sc->sc_ac.ac_enaddr[i] = (ea[i] >> 24) & 0377;
+ else
+ sc->sc_ac.ac_enaddr[i] = (ea[i] >> 8) & 0377;
+
vax_unmap_physmem((vaddr_t)ea, 1);
scb_vecalloc(SGECVEC, (void (*)(void *)) sgec_intr, sc, SCB_ISTACK);