d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove oldcard support by removing the compat shims.

Browse Source
This commit is contained in:
Warner Losh 2005-09-20 19:49:33 +00:00
parent b152e6d1fc
commit 7a5b855af3
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/cs/if_cs_pccard.c
View File

@ -55,7 +55,7 @@ static const struct pccard_product cs_pccard_products[] = {
{ NULL }
};
static int
cs_pccard_match(device_t dev)
cs_pccard_probe(device_t dev)
{
const struct pccard_product *pp;
int error;
@ -78,26 +78,15 @@ cs_pccard_match(device_t dev)
}
static int
cs_pccard_probe(device_t dev)
cs_pccard_attach(device_t dev)
{
struct cs_softc *sc = device_get_softc(dev);
int error;
sc->flags |= CS_NO_IRQ;
error = cs_cs89x0_probe(dev);
cs_release_resources(dev);
return (error);
}
static int
cs_pccard_attach(device_t dev)
{
struct cs_softc *sc = device_get_softc(dev);
int error;
error = cs_alloc_port(dev, sc->port_rid, CS_89x0_IO_PORTS);
if (error != 0)
goto bad;
return (error);
error = cs_alloc_irq(dev, sc->irq_rid, 0);
if (error != 0)
goto bad;
@ -114,15 +103,10 @@ cs_pccard_attach(device_t dev)
static device_method_t cs_pccard_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, pccard_compat_probe),
DEVMETHOD(device_attach, pccard_compat_attach),
DEVMETHOD(device_probe, cs_pccard_probe),
DEVMETHOD(device_attach, cs_pccard_attach),
DEVMETHOD(device_detach, cs_detach),
/* Card interface */
DEVMETHOD(card_compat_match, cs_pccard_match),
DEVMETHOD(card_compat_probe, cs_pccard_probe),
DEVMETHOD(card_compat_attach, cs_pccard_attach),
{ 0, 0 }
};