diff options
| author | imp <imp@FreeBSD.org> | 2005-07-13 14:57:36 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-07-13 14:57:36 +0000 |
| commit | 119e3e5841265aff988b3f9e400571e1e7529a1b (patch) | |
| tree | 79df95aaac57bdc7c1e51169fed25b70b61e9992 /sys/dev/xe/if_xe.c | |
| parent | 6606607b44cb595b06b7415323f43a01b5ccf64a (diff) | |
| download | FreeBSD-src-119e3e5841265aff988b3f9e400571e1e7529a1b.zip FreeBSD-src-119e3e5841265aff988b3f9e400571e1e7529a1b.tar.gz | |
Stop using OLDCARD shims. rename xe_pccard_match to xe_pccard_probe
and combine the old xe_pccard_{probe,attach} into one routine _attach.
Create a lookup function to lookup items in the table. Eliminate the
check for network cards, since many modems were eliminated by it.
Tweak a few printfs as well.
This gets many of my older cards working again CEM2, CEM28, CEM36,
etc.
Diffstat (limited to 'sys/dev/xe/if_xe.c')
| -rw-r--r-- | sys/dev/xe/if_xe.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index cb706a9..cb4f636 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -277,13 +277,9 @@ xe_attach (device_t dev) scp->srev = (XE_INB(XE_BOV) & 0x30) >> 4; /* Print some useful information */ - device_printf(dev, "%s %s, version 0x%02x/0x%02x%s%s\n", - scp->vendor, - scp->card_type, - scp->version, - scp->srev, - scp->mohawk ? ", 100Mbps capable" : "", - scp->modem ? ", with modem" : ""); + device_printf(dev, "version 0x%02x/0x%02x%s%s\n", scp->version, + scp->srev, scp->mohawk ? ", 100Mbps capable" : "", + scp->modem ? ", with modem" : ""); if (scp->mohawk) { XE_SELECT_PAGE(0x10); DEVPRINTF(1, (dev, "DingoID=0x%04x, RevisionID=0x%04x, VendorID=0x%04x\n", @@ -1900,8 +1896,7 @@ xe_activate(device_t dev) for (i = 0; i < 2; i++) { start += (i == 0 ? 8 : -24); sc->port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->port_rid, start, - start + 18, 18, RF_ACTIVE); + &sc->port_rid, start, start + 15, 16, RF_ACTIVE); if (sc->port_res == 0) continue; /* Failed, try again if possible */ if (bus_get_resource_start(dev, SYS_RES_IOPORT, |
