static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
NULL,
-#ifdef HAVE_PM_LINUX_PROC
+#ifdef PCI_HAVE_PM_LINUX_SYSFS
+ &pm_linux_sysfs,
+#else
+ NULL,
+#endif
+#ifdef PCI_HAVE_PM_LINUX_PROC
&pm_linux_proc,
#else
NULL,
#endif
-#ifdef HAVE_PM_INTEL_CONF
+#ifdef PCI_HAVE_PM_INTEL_CONF
&pm_intel_conf1,
&pm_intel_conf2,
#else
NULL,
NULL,
#endif
-#ifdef HAVE_PM_FBSD_DEVICE
+#ifdef PCI_HAVE_PM_FBSD_DEVICE
&pm_fbsd_device,
#else
NULL,
#endif
-#ifdef HAVE_PM_AIX_DEVICE
+#ifdef PCI_HAVE_PM_AIX_DEVICE
&pm_aix_device,
#else
NULL,
#endif
-#ifdef HAVE_PM_NBSD_LIBPCI
+#ifdef PCI_HAVE_PM_NBSD_LIBPCI
&pm_nbsd_libpci,
#else
NULL,
#endif
-#ifdef HAVE_PM_DUMP
+#ifdef PCI_HAVE_PM_DUMP
&pm_dump,
#else
NULL,
int i;
bzero(a, sizeof(*a));
- a->id_file_name = PATH_PCI_IDS;
+ a->id_file_name = PCI_PATH_IDS;
for(i=0; i<PCI_ACCESS_MAX; i++)
if (pci_methods[i] && pci_methods[i]->config)
pci_methods[i]->config(a);
bzero(d, sizeof(*d));
d->access = a;
d->methods = a->methods;
+ d->hdrtype = -1;
if (d->methods->init_dev)
d->methods->init_dev(d);
return d;
}
struct pci_dev *
-pci_get_dev(struct pci_access *a, int bus, int dev, int func)
+pci_get_dev(struct pci_access *a, int domain, int bus, int dev, int func)
{
struct pci_dev *d = pci_alloc_dev(a);
+ d->domain = domain;
d->bus = bus;
d->dev = dev;
d->func = func;