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

Some cards don't have the info entries in the CIS, so vendorstr and/or

Browse Source 
prodstr may be NULL when fetched.  For the default device description,
guard against this and return the numeric IDs instead when this
happens.  For the matching routines, and consider NULL to not match
those entries that aren't NULL w/o calling strcmp.

Early patches by: Anders Hanssen
This commit is contained in:
Warner Losh 2004-08-16 15:57:18 +00:00
parent e6fb0bd676
commit 977b24f6e6
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/pccard/pccard.c
View File

@ -152,17 +152,29 @@ static int
pccard_set_default_descr(device_t dev)
{
const char *vendorstr, *prodstr;
uint32_t vendor, prod;
char *str;
if (pccard_get_vendor_str(dev, &vendorstr))
return (0);
if (pccard_get_product_str(dev, &prodstr))
return (0);
str = malloc(strlen(vendorstr) + strlen(prodstr) + 2, M_DEVBUF,
M_WAITOK);
sprintf(str, "%s %s", vendorstr, prodstr);
device_set_desc_copy(dev, str);
free(str, M_DEVBUF);
if (vendorstr != NULL && prodstr != NULL) {
str = malloc(strlen(vendorstr) + strlen(prodstr) + 2, M_DEVBUF,
M_WAITOK);
sprintf(str, "%s %s", vendorstr, prodstr);
device_set_desc_copy(dev, str);
free(str, M_DEVBUF);
} else {
if (pccard_get_vendor(dev, &vendor))
return (0);
if (pccard_get_product(dev, &prod))
return (0);
str = malloc(100, M_DEVBUF, M_WAITOK);
snprintf(str, 100, "vendor=0x%x product=0x%x", vendor, prod);
device_set_desc_copy(dev, str);
free(str, M_DEVBUF);
}
return (0);
}
@ -366,10 +378,12 @@ pccard_do_product_lookup(device_t bus, device_t dev,
if (matches && fcn != ent->pp_expfunc)
matches = 0;
if (matches && ent->pp_cis[0] &&
strcmp(ent->pp_cis[0], vendorstr) != 0)
(vendorstr == NULL ||
strcmp(ent->pp_cis[0], vendorstr) != 0))
matches = 0;
if (matches && ent->pp_cis[1] &&
strcmp(ent->pp_cis[1], prodstr) != 0)
(prodstr == NULL ||
strcmp(ent->pp_cis[1], prodstr) != 0))
matches = 0;
/* XXX need to match cis[2] and cis[3] also XXX */
if (matchfn != NULL)