More Windows stuff.

[pciutils.git] / lib / sysfs.c

diff --git a/lib/sysfs.c b/lib/sysfs.c
index c0cf5a3bfef5202db1f69a689fbee9811e03b0ef..2c0a46f7763aa2764660873da73ca040e8f3fe12 100644 (file)
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -25,7 +25,7 @@
 static void
 sysfs_config(struct pci_access *a)
 {
-  a->method_params[PCI_ACCESS_SYS_BUS_PCI] = PATH_SYS_BUS_PCI;
+  a->method_params[PCI_ACCESS_SYS_BUS_PCI] = PCI_PATH_SYS_BUS_PCI;
 }
 
 static inline char *
@@ -105,7 +105,7 @@ sysfs_get_resources(struct pci_dev *d)
   file = fopen(namebuf, "r");
   if (!file)
     a->error("Cannot open %s: %s", namebuf, strerror(errno));
-  for (i = 0; i < 8; i++)
+  for (i = 0; i < 7; i++)
     {
       unsigned long long start, end, size;
       if (!fgets(buf, sizeof(buf), file))
@@ -115,14 +115,14 @@ sysfs_get_resources(struct pci_dev *d)
       if (start != (unsigned long long)(pciaddr_t) start ||
          end != (unsigned long long)(pciaddr_t) end)
        {
-         a->warning("Resource %d in %s has a 64-bit address, ignoring", namebuf);
+         a->warning("Resource %d in %s has a 64-bit address, ignoring", i, namebuf);
          start = end = 0;
        }
       if (start)
        size = end - start + 1;
       else
        size = 0;
-      if (i < 7)
+      if (i < 6)
        {
          d->base_addr[i] = start;
          d->size[i] = size;
@@ -222,10 +222,7 @@ static int sysfs_read(struct pci_dev *d, int pos, byte *buf, int len)
       return 0;
     }
   else if (res != len)
-    {
-      d->access->warning("sysfs_read: tried to read %d bytes at %d, but got only %d", len, pos, res);
-      return 0;
-    }
+    return 0;
   return 1;
 }
 
@@ -244,7 +241,7 @@ static int sysfs_write(struct pci_dev *d, int pos, byte *buf, int len)
     }
   else if (res != len)
     {
-      d->access->warning("sysfs_write: tried to write %d bytes at %d, but got only %d", len, pos, res);
+      d->access->warning("sysfs_write: tried to write %d bytes at %d, but only %d succeeded", len, pos, res);
       return 0;
     }
   return 1;