diff options
author | imp <imp@FreeBSD.org> | 2005-09-20 19:49:33 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-09-20 19:49:33 +0000 |
commit | c1ba22dc8d6f4a56c7a2f2ebfc6904ef6b413695 (patch) | |
tree | 845a2770cd408467a929b64203a0871be6434a24 /sys | |
parent | aaf30390958780e52006570cfed624d13098ec92 (diff) | |
download | FreeBSD-src-c1ba22dc8d6f4a56c7a2f2ebfc6904ef6b413695.zip FreeBSD-src-c1ba22dc8d6f4a56c7a2f2ebfc6904ef6b413695.tar.gz |
Remove oldcard support by removing the compat shims.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/cs/if_cs_pccard.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c index 6935bf4..794f48d 100644 --- a/sys/dev/cs/if_cs_pccard.c +++ b/sys/dev/cs/if_cs_pccard.c @@ -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 @@ bad: 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 } }; |