diff options
| author | imp <imp@FreeBSD.org> | 2005-01-24 06:54:05 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-01-24 06:54:05 +0000 |
| commit | c5de1d405c7a22b71d98382edd73b3fe59a27a2d (patch) | |
| tree | 4562769ab247f8b81b95fd7538039b38d78d1c97 /sys/dev/pccard | |
| parent | ec27adbe26d4c756d1f3c3eb4f31ecc4c3dc9bd8 (diff) | |
| download | FreeBSD-src-c5de1d405c7a22b71d98382edd73b3fe59a27a2d.zip FreeBSD-src-c5de1d405c7a22b71d98382edd73b3fe59a27a2d.tar.gz | |
Ignore the expected function number.
NetBSD went this route a while ago. FreeBSD originally tried this to
cope with multifunction cards. However, it turns out that we're
better off not worrying about the function number, and instead worry
about the function type for the function. This has worked well in
NetBSD, and all FreeBSD's relevant drivers have been converted.
# I'll rework the macros that specify them shortly, as soon as I can
# come up with a good, compatible way to deal...
Diffstat (limited to 'sys/dev/pccard')
| -rw-r--r-- | sys/dev/pccard/pccard.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 4547537..00a9015 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -335,7 +335,6 @@ pccard_do_product_lookup(device_t bus, device_t dev, { const struct pccard_product *ent; int matches; - uint32_t fcn; uint32_t vendor; uint32_t prod; const char *vendorstr; @@ -352,8 +351,6 @@ pccard_do_product_lookup(device_t bus, device_t dev, return (NULL); if (pccard_get_product(dev, &prod)) return (NULL); - if (pccard_get_function_number(dev, &fcn)) - return (NULL); if (pccard_get_vendor_str(dev, &vendorstr)) return (NULL); if (pccard_get_product_str(dev, &prodstr)) @@ -381,8 +378,6 @@ pccard_do_product_lookup(device_t bus, device_t dev, if (matches && ent->pp_product != PCCARD_PRODUCT_ANY && prod != ent->pp_product) matches = 0; - if (matches && fcn != ent->pp_expfunc) - matches = 0; if (matches && ent->pp_cis[0] && (vendorstr == NULL || strcmp(ent->pp_cis[0], vendorstr) != 0)) |
