diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-04-23 19:44:32 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-04-23 19:44:32 +0000 |
| commit | 4795f4a8109402b06f3dda778d737564ed70cd56 (patch) | |
| tree | f32f76bbe3565c8739a1aa6948800640403aed0b /sys/dev/ic | |
| parent | 184ee869ab7294afcd1911aa38e433b792057dcc (diff) | |
Make code path for ADMTek variant endian-safe; fixes dc(4) on macppc.
ok brad@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/dc.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index df227d51e98..ecbfdb9591a 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.92 2006/03/25 22:41:42 djm Exp $ */ +/* $OpenBSD: dc.c,v 1.93 2006/04/23 19:44:31 kettenis Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1023,8 +1023,9 @@ dc_setfilt_admtek(sc) ifp = &sc->sc_arpcom.ac_if; /* Init our MAC address */ - CSR_WRITE_4(sc, DC_AL_PAR0, *(u_int32_t *)(&sc->sc_arpcom.ac_enaddr[0])); - CSR_WRITE_4(sc, DC_AL_PAR1, *(u_int32_t *)(&sc->sc_arpcom.ac_enaddr[4])); + CSR_WRITE_4(sc, DC_AL_PAR0, ac->ac_enaddr[3] << 24 | + ac->ac_enaddr[2] << 16 | ac->ac_enaddr[1] << 8 | ac->ac_enaddr[0]); + CSR_WRITE_4(sc, DC_AL_PAR1, ac->ac_enaddr[5] << 8 | ac->ac_enaddr[4]); /* If we want promiscuous mode, set the allframes bit. */ if (ifp->if_flags & IFF_PROMISC) @@ -1652,6 +1653,7 @@ dc_attach(sc) { struct ifnet *ifp; int mac_offset, tmp, i; + u_int32_t reg; /* * Get station address from the EEPROM. @@ -1681,10 +1683,14 @@ dc_attach(sc) break; case DC_TYPE_AL981: case DC_TYPE_AN983: - *(u_int32_t *)(&sc->sc_arpcom.ac_enaddr[0]) = - CSR_READ_4(sc, DC_AL_PAR0); - *(u_int16_t *)(&sc->sc_arpcom.ac_enaddr[4]) = - CSR_READ_4(sc, DC_AL_PAR1); + reg = CSR_READ_4(sc, DC_AL_PAR0); + sc->sc_arpcom.ac_enaddr[0] = (reg & 0xff); + sc->sc_arpcom.ac_enaddr[1] = (reg >> 8) & 0xff; + sc->sc_arpcom.ac_enaddr[2] = (reg >> 16) & 0xff; + sc->sc_arpcom.ac_enaddr[3] = (reg >> 24) & 0xff; + reg = CSR_READ_4(sc, DC_AL_PAR1); + sc->sc_arpcom.ac_enaddr[4] = (reg & 0xff); + sc->sc_arpcom.ac_enaddr[5] = (reg >> 8) & 0xff; break; case DC_TYPE_CONEXANT: bcopy(&sc->dc_srom + DC_CONEXANT_EE_NODEADDR, |