Released as 3.5.4

[pciutils.git] / lib / proc.c

diff --git a/lib/proc.c b/lib/proc.c
index 9d02b4107d5dc9781c2b4bb10556c63d0ecce655..cb9d08d17768dd1379849ca505d58ebe33067fae 100644 (file)
--- a/lib/proc.c
+++ b/lib/proc.c
@@ -21,13 +21,13 @@
 static void
 proc_config(struct pci_access *a)
 {
-  a->method_params[PCI_ACCESS_PROC_BUS_PCI] = PATH_PROC_BUS_PCI;
+  pci_define_param(a, "proc.path", PCI_PATH_PROC_BUS_PCI, "Path to the procfs bus tree");
 }
 
 static int
 proc_detect(struct pci_access *a)
 {
-  char *name = a->method_params[PCI_ACCESS_PROC_BUS_PCI];
+  char *name = pci_get_param(a, "proc.path");
 
   if (access(name, R_OK))
     {
@@ -60,7 +60,7 @@ proc_scan(struct pci_access *a)
   FILE *f;
   char buf[512];
 
-  if (snprintf(buf, sizeof(buf), "%s/devices", a->method_params[PCI_ACCESS_PROC_BUS_PCI]) == sizeof(buf))
+  if (snprintf(buf, sizeof(buf), "%s/devices", pci_get_param(a, "proc.path")) == sizeof(buf))
     a->error("File name too long");
   f = fopen(buf, "r");
   if (!f)
@@ -97,10 +97,10 @@ proc_scan(struct pci_access *a)
       d->func = PCI_FUNC(dfn & 0xff);
       d->vendor_id = vend >> 16U;
       d->device_id = vend & 0xffff;
-      known = PCI_FILL_IDENT;
+      known = 0;
       if (!a->buscentric)
        {
-         known |= PCI_FILL_IRQ | PCI_FILL_BASES;
+         known |= PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES;
          if (cnt >= 10)
            known |= PCI_FILL_ROM_BASE;
          if (cnt >= 17)
@@ -124,12 +124,21 @@ proc_setup(struct pci_dev *d, int rw)
       if (a->fd >= 0)
        close(a->fd);
       e = snprintf(buf, sizeof(buf), "%s/%02x/%02x.%d",
-                  a->method_params[PCI_ACCESS_PROC_BUS_PCI],
+                  pci_get_param(a, "proc.path"),
                   d->bus, d->dev, d->func);
       if (e < 0 || e >= (int) sizeof(buf))
        a->error("File name too long");
       a->fd_rw = a->writeable || rw;
       a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
+      if (a->fd < 0)
+       {
+         e = snprintf(buf, sizeof(buf), "%s/%04x:%02x/%02x.%d",
+                      pci_get_param(a, "proc.path"),
+                      d->domain, d->bus, d->dev, d->func);
+         if (e < 0 || e >= (int) sizeof(buf))
+           a->error("File name too long");
+         a->fd = open(buf, a->fd_rw ? O_RDWR : O_RDONLY);
+       }
       if (a->fd < 0)
        a->warning("Cannot open %s", buf);
       a->cached_dev = d;
@@ -153,7 +162,7 @@ proc_read(struct pci_dev *d, int pos, byte *buf, int len)
       return 0;
     }
   else if (res != len)
-    d->access->warning("proc_read: tried to read %d bytes at %d, but got only %d", len, pos, res);
+    return 0;
   return 1;
 }
 
@@ -187,7 +196,8 @@ proc_cleanup_dev(struct pci_dev *d)
 }
 
 struct pci_methods pm_linux_proc = {
-  "Linux-proc",
+  "linux-proc",
+  "The proc file system on Linux",
   proc_config,
   proc_detect,
   proc_init,
@@ -196,6 +206,7 @@ struct pci_methods pm_linux_proc = {
   pci_generic_fill_info,
   proc_read,
   proc_write,
+  NULL,                                        /* read_vpd */
   NULL,                                        /* init_dev */
   proc_cleanup_dev
 };