diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ed/if_ed_pccard.c | 10 | ||||
-rw-r--r-- | sys/dev/pccard/pccardvar.h | 13 |
2 files changed, 23 insertions, 0 deletions
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index a8c819a..af8cd9a 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -42,6 +42,7 @@ #include <net/if_mib.h> #include <dev/ed/if_edvar.h> +#include <dev/pccard/pccardvar.h> /* * PC-Card (PCMCIA) specific code. @@ -132,6 +133,9 @@ ed_pccard_attach(device_t dev) struct ed_softc *sc = device_get_softc(dev); int flags = device_get_flags(dev); int error; + int i; + u_char sum; + u_char ether_addr[ETHER_ADDR_LEN]; if (sc->port_used > 0) ed_alloc_port(dev, sc->port_rid, sc->port_used); @@ -147,6 +151,12 @@ ed_pccard_attach(device_t dev) return (error); } + pccard_get_ether(dev, ether_addr); + for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++) + sum |= ether_addr[i]; + if (sum) + bcopy(ether_addr, sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); + error = ed_attach(sc, device_get_unit(dev), flags); return (error); } diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 3504f68..ed26e3f 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -269,3 +269,16 @@ void pccard_io_unmap(struct pccard_function *, int); #define pccard_mem_unmap(pf, window) \ (pccard_chip_mem_unmap((pf)->sc->pct, (pf)->sc->pch, (window))) + +/* ivar interface */ +enum { + PCCARD_IVAR_ETHADDR, /* read ethernet address from CIS tupple */ +}; + +/* read ethernet address from CIS tupple */ +__inline static int +pccard_get_ether(device_t dev, u_char *enaddr) +{ + return BUS_READ_IVAR(device_get_parent(dev), dev, + PCCARD_IVAR_ETHADDR, (uintptr_t *)enaddr); +} |