Let filters accept vendor and device 0xffff.

[pciutils.git] / lib / obsd-device.c

diff --git a/lib/obsd-device.c b/lib/obsd-device.c
index c24f2e361dbdebf4582178c4b34268cfe07cccff..62395b376f2b5917d84f1797cede1faebfc5eece 100644 (file)
--- a/lib/obsd-device.c
+++ b/lib/obsd-device.c
@@ -19,13 +19,13 @@
 static void
 obsd_config(struct pci_access *a)
 {
-  a->method_params[PCI_ACCESS_OBSD_DEVICE] = PCI_PATH_OBSD_DEVICE;
+  pci_define_param(a, "obsd.path", PCI_PATH_OBSD_DEVICE, "Path to the OpenBSD PCI device");
 }
 
 static int
 obsd_detect(struct pci_access *a)
 {
-  char *name = a->method_params[PCI_ACCESS_OBSD_DEVICE];
+  char *name = pci_get_param(a, "obsd.path");
 
   if (access(name, R_OK))
     {
@@ -39,13 +39,11 @@ obsd_detect(struct pci_access *a)
 static void
 obsd_init(struct pci_access *a)
 {
-  char *name = a->method_params[PCI_ACCESS_OBSD_DEVICE];
+  char *name = pci_get_param(a, "obsd.path");
 
   a->fd = open(name, O_RDWR, 0);
   if (a->fd < 0)
-    {
-      a->error("obsd_init: %s open failed", name);
-    }
+    a->error("obsd_init: %s open failed", name);
 }
 
 static void
@@ -65,9 +63,7 @@ obsd_read(struct pci_dev *d, int pos, byte *buf, int len)
   } u;
 
   if (!(len == 1 || len == 2 || len == 4))
-    {
-      return pci_generic_block_read(d, pos, buf, len);
-    }
+    return pci_generic_block_read(d, pos, buf, len);
 
   if (pos >= 256)
     return 0;
@@ -80,11 +76,10 @@ obsd_read(struct pci_dev *d, int pos, byte *buf, int len)
   pi.pi_width = 4;
 
   if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0) {
-         if (errno == ENXIO) {
+         if (errno == ENXIO)
                  pi.pi_data = 0xffffffff;
-         } else {
+         else
                  d->access->error("obsd_read: ioctl(PCIOCREAD) failed");
-         }
   }
   u.u32 = pi.pi_data;
 
@@ -109,9 +104,7 @@ obsd_write(struct pci_dev *d, int pos, byte *buf, int len)
   struct pci_io pi;
 
   if (!(len == 1 || len == 2 || len == 4))
-    {
-      return pci_generic_block_write(d, pos, buf, len);
-    }
+    return pci_generic_block_write(d, pos, buf, len);
 
   if (pos >= 256)
     return 0;
@@ -137,15 +130,14 @@ obsd_write(struct pci_dev *d, int pos, byte *buf, int len)
     }
 
   if (ioctl(d->access->fd, PCIOCWRITE, &pi) < 0)
-    {
-      d->access->error("obsd_write: ioctl(PCIOCWRITE) failed");
-    }
+    d->access->error("obsd_write: ioctl(PCIOCWRITE) failed");
 
   return 1;
 }
 
 struct pci_methods pm_obsd_device = {
-  "OpenBSD-device",
+  "obsd-device",
+  "/dev/pci on OpenBSD",
   obsd_config,
   obsd_detect,
   obsd_init,