26c26
< * $FreeBSD: head/sys/dev/aic/aic_pccard.c 69960 2000-12-13 05:46:23Z imp $
---
> * $FreeBSD: head/sys/dev/aic/aic_pccard.c 70782 2001-01-08 01:59:15Z imp $
39a40,41
> #include <dev/pccard/pccardvar.h>
> #include <dev/pccard/pccarddevs.h>
40a43,44
> #include "card_if.h"
>
48,51c52,56
< static int aic_pccard_alloc_resources __P((device_t));
< static void aic_pccard_release_resources __P((device_t));
< static int aic_pccard_probe __P((device_t));
< static int aic_pccard_attach __P((device_t));
---
> static int aic_pccard_alloc_resources(device_t);
> static void aic_pccard_release_resources(device_t);
> static int aic_pccard_match(device_t);
> static int aic_pccard_probe(device_t);
> static int aic_pccard_attach(device_t);
52a58,70
> const struct pccard_product aic_pccard_products[] = {
> { PCCARD_STR_ADAPTEC_APA1460, PCCARD_VENDOR_ADAPTEC,
> PCCARD_PRODUCT_ADAPTEC_APA1460, 0, NULL, NULL },
>
> { PCCARD_STR_ADAPTEC_APA1460A, PCCARD_VENDOR_ADAPTEC,
> PCCARD_PRODUCT_ADAPTEC_APA1460A, 0, NULL, NULL },
>
> { PCCARD_STR_NEWMEDIA_BUSTOASTER, PCCARD_VENDOR_NEWMEDIA,
> PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER, 0, NULL, NULL },
>
> { NULL }
> };
>
95a114,126
> aic_pccard_match(device_t dev)
> {
> const struct pccard_product *pp;
>
> if ((pp = pccard_product_lookup(dev, aic_pccard_products,
> sizeof(aic_pccard_products[0]), NULL)) != NULL) {
> device_set_desc(dev, pp->pp_name);
> return 0;
> }
> return EIO;
> }
>
> static int
167,168c198,199
< DEVMETHOD(device_probe, aic_pccard_probe),
< DEVMETHOD(device_attach, aic_pccard_attach),
---
> DEVMETHOD(device_probe, pccard_compat_probe),
> DEVMETHOD(device_attach, pccard_compat_attach),
169a201,206
>
> /* Card interface */
> DEVMETHOD(card_compat_match, aic_pccard_match),
> DEVMETHOD(card_compat_probe, aic_pccard_probe),
> DEVMETHOD(card_compat_attach, aic_pccard_attach),
>