system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-17 13:53:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFp4: Remove OLDCARD shims

Browse source
This commit is contained in:
Warner Losh 2005-09-22 04:51:11 +00:00
parent b1d1a29cf6
commit 09ec45fd15
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150448
1 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
sys/dev/an/if_an_pccard.c
View file

@ -77,22 +77,16 @@ __FBSDID("$FreeBSD$");
/*
* Support for PCMCIA cards.
*/
static int an_pccard_match(device_t);
static int an_pccard_probe(device_t);
static int an_pccard_attach(device_t);
static device_method_t an_pccard_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, pccard_compat_probe),
DEVMETHOD(device_attach, pccard_compat_attach),
DEVMETHOD(device_probe, an_pccard_probe),
DEVMETHOD(device_attach, an_pccard_attach),
DEVMETHOD(device_detach, an_detach),
DEVMETHOD(device_shutdown, an_shutdown),
/* Card interface */
DEVMETHOD(card_compat_match, an_pccard_match),
DEVMETHOD(card_compat_probe, an_pccard_probe),
DEVMETHOD(card_compat_attach, an_pccard_attach),
{ 0, 0 }
};
@ -116,7 +110,7 @@ static const struct pccard_product an_pccard_products[] = {
};
static int
an_pccard_match(device_t dev)
an_pccard_probe(device_t dev)
{
const struct pccard_product *pp;
@ -129,30 +123,22 @@ an_pccard_match(device_t dev)
return (ENXIO);
}
static int
an_pccard_probe(device_t dev)
{
int error;
error = an_probe(dev); /* 0 is failure for now */
if (error != 0) {
device_set_desc(dev, "Aironet PC4500/PC4800");
error = an_alloc_irq(dev, 0, 0);
} else
error = 1;
an_release_resources(dev);
return (error);
}
static int
an_pccard_attach(device_t dev)
{
struct an_softc *sc = device_get_softc(dev);
int flags = device_get_flags(dev);
int error;
int error;
error = an_probe(dev); /* 0 is failure for now */
if (error == 0) {
error = ENXIO;
goto fail;
}
error = an_alloc_irq(dev, 0, 0);
if (error != 0)
goto fail;
an_alloc_port(dev, sc->port_rid, AN_IOSIZ);
an_alloc_irq(dev, sc->irq_rid, 0);
sc->an_bhandle = rman_get_bushandle(sc->port_res);