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

Use pci_find_cap() instead of pci_find_extcap() to locate PCI

Browse Source 
find capabilities as the latter API is deprecated for this purpose.

MFC after:	2 weeks
This commit is contained in:
John Baldwin 2012-03-03 18:03:50 +00:00
parent 45b586acc4
commit cda6c6abf9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/oce/oce_hw.c
View File

@ -203,12 +203,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
{
uint32_t val;
if (pci_find_extcap(sc->dev, PCIY_PCIX, &val) == 0) {
if (pci_find_cap(sc->dev, PCIY_PCIX, &val) == 0) {
if (val != 0)
sc->flags |= OCE_FLAGS_PCIX;
}
if (pci_find_extcap(sc->dev, PCIY_EXPRESS, &val) == 0) {
if (pci_find_cap(sc->dev, PCIY_EXPRESS, &val) == 0) {
if (val != 0) {
uint16_t link_status =
pci_read_config(sc->dev, val + 0x12, 2);
@ -219,12 +219,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
}
}
if (pci_find_extcap(sc->dev, PCIY_MSI, &val) == 0) {
if (pci_find_cap(sc->dev, PCIY_MSI, &val) == 0) {
if (val != 0)
sc->flags |= OCE_FLAGS_MSI_CAPABLE;
}
if (pci_find_extcap(sc->dev, PCIY_MSIX, &val) == 0) {
if (pci_find_cap(sc->dev, PCIY_MSIX, &val) == 0) {
if (val != 0) {
val = pci_msix_count(sc->dev);
sc->flags |= OCE_FLAGS_MSIX_CAPABLE;

4
sys/dev/virtio/pci/virtio_pci.c
View File

@ -251,10 +251,10 @@ vtpci_attach(device_t dev)
return (ENXIO);
}
if (pci_find_extcap(dev, PCIY_MSI, NULL) != 0)
if (pci_find_cap(dev, PCIY_MSI, NULL) != 0)
sc->vtpci_flags |= VIRTIO_PCI_FLAG_NO_MSI;
if (pci_find_extcap(dev, PCIY_MSIX, NULL) == 0) {
if (pci_find_cap(dev, PCIY_MSIX, NULL) == 0) {
rid = PCIR_BAR(1);
sc->vtpci_msix_res = bus_alloc_resource_any(dev,
SYS_RES_MEMORY, &rid, RF_ACTIVE);