Page MenuHomeFreeBSD
Files F112547932

D45877.diff
No OneTemporary
Actions

D45877.diff
View Options

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -164,18 +164,12 @@
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
DEVMETHOD(bus_delete_resource, pci_delete_resource),
DEVMETHOD(bus_alloc_resource, pci_alloc_resource),
-#ifdef PCI_IOV
DEVMETHOD(bus_adjust_resource, pci_adjust_resource),
-#else
- DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
-#endif
DEVMETHOD(bus_release_resource, pci_release_resource),
DEVMETHOD(bus_activate_resource, pci_activate_resource),
DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource),
-#ifdef PCI_IOV
DEVMETHOD(bus_map_resource, pci_map_resource),
DEVMETHOD(bus_unmap_resource, pci_unmap_resource),
-#endif
DEVMETHOD(bus_child_deleted, pci_child_deleted),
DEVMETHOD(bus_child_detached, pci_child_detached),
DEVMETHOD(bus_child_pnpinfo, pci_child_pnpinfo_method),
@@ -5754,11 +5748,11 @@
return (0);
}
-#ifdef PCI_IOV
int
pci_adjust_resource(device_t dev, device_t child, struct resource *r,
rman_res_t start, rman_res_t end)
{
+#ifdef PCI_IOV
struct pci_devinfo *dinfo;
if (device_get_parent(child) != dev)
@@ -5778,6 +5772,7 @@
/* Fall through for other types of resource allocations. */
}
+#endif
return (bus_generic_adjust_resource(dev, child, r, start, end));
}
@@ -5786,6 +5781,7 @@
pci_map_resource(device_t dev, device_t child, struct resource *r,
struct resource_map_request *argsp, struct resource_map *map)
{
+#ifdef PCI_IOV
struct pci_devinfo *dinfo;
if (device_get_parent(child) != dev)
@@ -5805,6 +5801,7 @@
/* Fall through for other types of resource allocations. */
}
+#endif
return (bus_generic_map_resource(dev, child, r, argsp, map));
}
@@ -5813,6 +5810,7 @@
pci_unmap_resource(device_t dev, device_t child, struct resource *r,
struct resource_map *map)
{
+#ifdef PCI_IOV
struct pci_devinfo *dinfo;
if (device_get_parent(child) != dev)
@@ -5830,10 +5828,10 @@
/* Fall through for other types of resource allocations. */
}
+#endif
return (bus_generic_unmap_resource(dev, child, r, map));
}
-#endif
void
pci_child_deleted(device_t dev, device_t child)

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 4:56 PM (18 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17232714
Default Alt Text
D45877.diff (2 KB)

Event Timeline