diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-09-16 05:01:27 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-09-16 05:01:27 +0000 |
| commit | 129eaf79963d8242f56272b9e55e7761c8c7d871 (patch) | |
| tree | cb0b74f06d490c8388f405bb08ac22abd4e6595e /sys/dev | |
| parent | 0c6d0171e6369a3a59b5bd3582f1bfe4d6be83c1 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/dc/if_dc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 8ddf66144647..4e284d39cc20 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -1957,7 +1957,7 @@ dc_attach(device_t dev) sc->dc_flags |= DC_TX_USE_TX_INTR; sc->dc_flags |= DC_TX_ADMTEK_WAR; sc->dc_pmode = DC_PMODE_MII; - dc_read_srom(sc, sc->dc_romwidth); + /* Don't read SROM for - auto-loaded on reset */ break; case DC_DEVICEID_98713: case DC_DEVICEID_98713_CP: @@ -2091,9 +2091,8 @@ dc_attach(device_t dev) break; case DC_TYPE_AL981: case DC_TYPE_AN985: - bcopy(sc->dc_srom + DC_AL_EE_NODEADDR, &eaddr, - ETHER_ADDR_LEN); - dc_read_eeprom(sc, (caddr_t)&eaddr, DC_AL_EE_NODEADDR, 3, 0); + *(u_int32_t *)(&eaddr[0]) = CSR_READ_4(sc, DC_AL_PAR0); + *(u_int16_t *)(&eaddr[4]) = CSR_READ_4(sc, DC_AL_PAR1); break; case DC_TYPE_CONEXANT: bcopy(sc->dc_srom + DC_CONEXANT_EE_NODEADDR, &eaddr, |