#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
{
struct pci_dev *d = pci_alloc_dev(a);
unsigned int dfn, vend, cnt, known;
+ char *driver;
+ int offset;
#define F " " PCIADDR_T_FMT
- cnt = sscanf(buf, "%x %x %x" F F F F F F F F F F F F F F,
+ cnt = sscanf(buf, "%x %x %x" F F F F F F F F F F F F F F "%n",
&dfn,
&vend,
&d->irq,
&d->size[3],
&d->size[4],
&d->size[5],
- &d->rom_size);
+ &d->rom_size,
+ &offset);
#undef F
if (cnt != 9 && cnt != 10 && cnt != 17)
a->error("proc: parse error (read only %d items)", cnt);
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)
known |= PCI_FILL_SIZES;
}
+ if (cnt >= 17)
+ {
+ while (buf[offset] && isspace(buf[offset]))
+ ++offset;
+ driver = &buf[offset];
+ while (buf[offset] && !isspace(buf[offset]))
+ ++offset;
+ buf[offset] = '\0';
+ if (driver[0])
+ {
+ pci_set_property(d, PCI_FILL_DRIVER, driver);
+ known |= PCI_FILL_DRIVER;
+ }
+ }
d->known_fields = known;
pci_link_dev(a, d);
}
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;
}
struct pci_methods pm_linux_proc = {
- "Linux-proc",
+ "linux-proc",
+ "The proc file system on Linux",
proc_config,
proc_detect,
proc_init,
pci_generic_fill_info,
proc_read,
proc_write,
+ NULL, /* read_vpd */
NULL, /* init_dev */
proc_cleanup_dev
};