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))
{
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
} 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)
+ if (d->domain || pos >= 256)
return 0;
pi.pi_sel.pc_bus = d->bus;
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;
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)
+ if (d->domain || pos >= 256)
return 0;
pi.pi_sel.pc_bus = d->bus;
}
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,
pci_generic_fill_info,
obsd_read,
obsd_write,
+ NULL, /* read_vpd */
NULL, /* dev_init */
NULL /* dev_cleanup */
};