X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fproc.c;h=cb9d08d17768dd1379849ca505d58ebe33067fae;hb=1efd2d4d5056e08d9ed7e42ab9b47d367422a653;hp=87b06317508b84f3c7804886828e73e2c815c46e;hpb=b801b390765b7d2064e176d4dcd66baa46aebe80;p=pciutils.git diff --git a/lib/proc.c b/lib/proc.c index 87b0631..cb9d08d 100644 --- a/lib/proc.c +++ b/lib/proc.c @@ -1,9 +1,7 @@ /* - * $Id: proc.c,v 1.2 1999/04/18 19:08:12 mj Exp $ - * * The PCI Library -- Configuration Access via /proc/bus/pci * - * Copyright (c) 1997--1999 Martin Mares + * Copyright (c) 1997--2003 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -18,53 +16,18 @@ #include #include "internal.h" - -#include -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 1 -#include -#endif - -/* - * As libc doesn't support pread/pwrite yet, we have to call them directly - * or use lseek/read/write instead. - */ -#if !(defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0) - -#if defined(__GLIBC__) && !(defined(__powerpc__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0) -#ifndef SYS_pread -#define SYS_pread __NR_pread -#endif -static int -pread(unsigned int fd, void *buf, size_t size, loff_t where) -{ - return syscall(SYS_pread, fd, buf, size, where); -} - -#ifndef SYS_pwrite -#define SYS_pwrite __NR_pwrite -#endif -static int -pwrite(unsigned int fd, void *buf, size_t size, loff_t where) -{ - return syscall(SYS_pwrite, fd, buf, size, where); -} -#else -static _syscall4(int, pread, unsigned int, fd, void *, buf, size_t, size, loff_t, where); -static _syscall4(int, pwrite, unsigned int, fd, void *, buf, size_t, size, loff_t, where); -#endif - -#endif +#include "pread.h" 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)) { @@ -95,9 +58,9 @@ static void proc_scan(struct pci_access *a) { FILE *f; - char buf[256]; + 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) @@ -105,14 +68,10 @@ proc_scan(struct pci_access *a) while (fgets(buf, sizeof(buf)-1, f)) { struct pci_dev *d = pci_alloc_dev(a); - unsigned int dfn, vend; - - sscanf(buf, -#ifdef HAVE_64BIT_ADDRESS - "%x %x %x %llx %llx %llx %llx %llx %llx %llx", -#else - "%x %x %x %lx %lx %lx %lx %lx %lx %lx", -#endif + unsigned int dfn, vend, cnt, known; + +#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, &dfn, &vend, &d->irq, @@ -122,14 +81,32 @@ proc_scan(struct pci_access *a) &d->base_addr[3], &d->base_addr[4], &d->base_addr[5], - &d->rom_base_addr); + &d->rom_base_addr, + &d->size[0], + &d->size[1], + &d->size[2], + &d->size[3], + &d->size[4], + &d->size[5], + &d->rom_size); +#undef F + if (cnt != 9 && cnt != 10 && cnt != 17) + a->error("proc: parse error (read only %d items)", cnt); d->bus = dfn >> 8U; d->dev = PCI_SLOT(dfn & 0xff); d->func = PCI_FUNC(dfn & 0xff); d->vendor_id = vend >> 16U; d->device_id = vend & 0xffff; - d->known_fields = a->buscentric ? PCI_FILL_IDENT - : (PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE); + known = 0; + if (!a->buscentric) + { + 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; + } + d->known_fields = known; pci_link_dev(a, d); } fclose(f); @@ -142,17 +119,30 @@ proc_setup(struct pci_dev *d, int rw) if (a->cached_dev != d || a->fd_rw < rw) { - char buf[256]; + char buf[1024]; + int e; if (a->fd >= 0) close(a->fd); - if (snprintf(buf, sizeof(buf), "%s/%02x/%02x.%d", a->method_params[PCI_ACCESS_PROC_BUS_PCI], - d->bus, d->dev, d->func) == sizeof(buf)) + e = snprintf(buf, sizeof(buf), "%s/%02x/%02x.%d", + 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; + a->fd_pos = 0; } return a->fd; } @@ -165,17 +155,14 @@ proc_read(struct pci_dev *d, int pos, byte *buf, int len) if (fd < 0) return 0; - res = pread(fd, buf, len, pos); + res = do_read(d, fd, buf, len, pos); if (res < 0) { d->access->warning("proc_read: read failed: %s", strerror(errno)); 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 0; return 1; } @@ -187,7 +174,7 @@ proc_write(struct pci_dev *d, int pos, byte *buf, int len) if (fd < 0) return 0; - res = pwrite(fd, buf, len, pos); + res = do_write(d, fd, buf, len, pos); if (res < 0) { d->access->warning("proc_write: write failed: %s", strerror(errno)); @@ -195,7 +182,7 @@ proc_write(struct pci_dev *d, int pos, byte *buf, int len) } else if (res != len) { - d->access->warning("proc_write: tried to write %d bytes at %d, but got only %d", len, pos, res); + d->access->warning("proc_write: tried to write %d bytes at %d, but only %d succeeded", len, pos, res); return 0; } return 1; @@ -209,7 +196,8 @@ proc_cleanup_dev(struct pci_dev *d) } struct pci_methods pm_linux_proc = { - "/proc/bus/pci", + "linux-proc", + "The proc file system on Linux", proc_config, proc_detect, proc_init, @@ -218,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 };