Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* the Chip field is currently unused in our pci ids list, so we prefer to provide the subsystem name when it is found as a second device description

Browse Source 
* adjusted pci device dump


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25472 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2008-05-12 16:55:47 +00:00
parent 8814495410
commit 996f75abbb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/private/shared/pci-utils.h
View File

@ -69,8 +69,9 @@ get_device_info(uint16 vendorID, uint16 deviceID,
// search for the device
for (i = 0; i < (int)PCI_DEVTABLE_LEN; i++) {
if (PciDevTable[i].VenId == vendorID && PciDevTable[i].DevId == deviceID ) {
*devShort = PciDevTable[i].Chip && PciDevTable[i].Chip[0] ? PciDevTable[i].Chip : NULL;
*devFull = PciDevTable[i].ChipDesc && PciDevTable[i].ChipDesc[0] ? PciDevTable[i].ChipDesc : NULL;
*devShort = PciDevTable[i].ChipDesc && PciDevTable[i].ChipDesc[0] ? PciDevTable[i].ChipDesc : NULL;
if (PciDevTable[i].SubVenId == 0 || PciDevTable[i].SubDevId == 0)
i++;
break;
}
}
@ -80,7 +81,6 @@ get_device_info(uint16 vendorID, uint16 deviceID,
if (PciDevTable[i].VenId != vendorID || PciDevTable[i].DevId != deviceID)
break;
if (PciDevTable[i].SubVenId == subvendorID && PciDevTable[i].SubDevId == subsystemID ) {
*devShort = PciDevTable[i].Chip && PciDevTable[i].Chip[0] ? PciDevTable[i].Chip : NULL;
*devFull = PciDevTable[i].ChipDesc && PciDevTable[i].ChipDesc[0] ? PciDevTable[i].ChipDesc : NULL;
break;
}

4
src/add-ons/kernel/bus_managers/pci/pci_info.cpp
View File

@ -178,13 +178,13 @@ print_info_basic(const pci_info *info, bool verbose)
if (!devShort && !devFull) {
TRACE(("PCI: device %04x: Unknown\n", info->device_id));
} else if (devShort && devFull) {
TRACE(("PCI: device %04x: %s - %s\n", info->device_id, devShort, devFull));
TRACE(("PCI: device %04x: %s (%s)\n", info->device_id, devShort, devFull));
} else {
TRACE(("PCI: device %04x: %s\n", info->device_id, devShort ? devShort : devFull));
}
#endif
char classInfo[64];
get_class_info(info->class_base, info->class_sub, info->class_api, classInfo, 64);
get_class_info(info->class_base, info->class_sub, info->class_api, classInfo, sizeof(classInfo));
TRACE(("PCI: info: %s\n", classInfo));
}
TRACE(("PCI: line_size %02x, latency %02x, header_type %02x, BIST %02x\n",