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

o No need to print the vendor/device ID for things that matched succesfully.

Browse Source 
o ``<device name>'' versus ``device name'' for things that fall under nomatch.

Reviewed by:	dfr (in principle)
Approved by:	Baron von Hubbard
This commit is contained in:
billf 2000-02-22 21:44:39 +00:00
parent 629de0ffcf
commit d8b29eaebf
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/pci/pci.c
View File

@ -1201,17 +1201,25 @@ pci_probe_nomatch(device_t dev, device_t child)
struct pci_devinfo *dinfo;
pcicfgregs *cfg;
const char *desc;
int unknown;
unknown = 0;
dinfo = device_get_ivars(child);
cfg = &dinfo->cfg;
desc = pci_ata_match(child);
if (!desc) desc = pci_usb_match(child);
if (!desc) desc = pci_vga_match(child);
if (!desc) desc = "unknown card";
device_printf(dev, desc);
printf(" (vendor=0x%04x, dev=0x%04x) at %d.%d",
cfg->vendor,
cfg->device,
if (!desc) {
desc = "unknown card";
unknown++;
}
device_printf(dev, "<%s>", desc);
if (bootverbose || unknown) {
printf(" (vendor=0x%04x, dev=0x%04x)",
cfg->vendor,
cfg->device);
}
printf(" at %d.%d",
pci_get_slot(child),
pci_get_function(child));
if (cfg->intpin > 0 && cfg->intline != 255) {

18
sys/pci/pci.c
View File

@ -1201,17 +1201,25 @@ pci_probe_nomatch(device_t dev, device_t child)
struct pci_devinfo *dinfo;
pcicfgregs *cfg;
const char *desc;
int unknown;
unknown = 0;
dinfo = device_get_ivars(child);
cfg = &dinfo->cfg;
desc = pci_ata_match(child);
if (!desc) desc = pci_usb_match(child);
if (!desc) desc = pci_vga_match(child);
if (!desc) desc = "unknown card";
device_printf(dev, desc);
printf(" (vendor=0x%04x, dev=0x%04x) at %d.%d",
cfg->vendor,
cfg->device,
if (!desc) {
desc = "unknown card";
unknown++;
}
device_printf(dev, "<%s>", desc);
if (bootverbose || unknown) {
printf(" (vendor=0x%04x, dev=0x%04x)",
cfg->vendor,
cfg->device);
}
printf(" at %d.%d",
pci_get_slot(child),
pci_get_function(child));
if (cfg->intpin > 0 && cfg->intline != 255) {