668e42c621
Mon Dec 08 2003 Bill Nottingham <notting@redhat.com> 2.1.11-4 - fix paths for pci.ids, etc. (#111665) Tue Nov 25 2003 Bill Nottingham <notting@redhat.com> 2.1.11-3 - remove a few calls to ->error() in the sysfs code Fri Nov 21 2003 Jeremy Katz <katzj@redhat.com> 2.1.11-2 - build a diet libpci_loader.a on i386 - always assume pread exists, it does with diet and all vaguely recent glibc Fri Nov 21 2003 Bill Nottingham <notting@redhat.com> 2.1.11-1 - update to 2.1.11 - add patch for sysfs & pci domains support (<willy@debian.org>)
127 lines
4.6 KiB
Diff
127 lines
4.6 KiB
Diff
--- pciutils-2.1.11/lib/sysfs.c.pread 2003-11-21 18:27:17.547950935 -0500
|
|
+++ pciutils-2.1.11/lib/sysfs.c 2003-11-21 18:27:56.021002787 -0500
|
|
@@ -24,60 +24,6 @@
|
|
|
|
#define SYSFS_PATH "/sys/bus/pci/devices"
|
|
|
|
-/*
|
|
- * We'd like to use pread/pwrite for configuration space accesses, but
|
|
- * unfortunately it isn't simple at all since all libc's until glibc 2.1
|
|
- * don't define it.
|
|
- */
|
|
-
|
|
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
|
|
-/* glibc 2.1 or newer -> pread/pwrite supported automatically */
|
|
-
|
|
-#elif defined(i386) && defined(__GLIBC__)
|
|
-/* glibc 2.0 on i386 -> call syscalls directly */
|
|
-#include <asm/unistd.h>
|
|
-#include <syscall-list.h>
|
|
-#ifndef SYS_pread
|
|
-#define SYS_pread 180
|
|
-#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 181
|
|
-#endif
|
|
-static int pwrite(unsigned int fd, void *buf, size_t size, loff_t where)
|
|
-{ return syscall(SYS_pwrite, fd, buf, size, where); }
|
|
-
|
|
-#elif defined(i386)
|
|
-/* old libc on i386 -> call syscalls directly the old way */
|
|
-#include <asm/unistd.h>
|
|
-static _syscall5(int, pread, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
|
|
-static _syscall5(int, pwrite, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
|
|
-static int do_read(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pread(fd, buf, size, where, 0); }
|
|
-static int do_write(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pwrite(fd, buf, size, where, 0); }
|
|
-#define HAVE_DO_READ
|
|
-
|
|
-#else
|
|
-/* In all other cases we use lseek/read/write instead to be safe */
|
|
-#define make_rw_glue(op) \
|
|
- static int do_##op(struct pci_dev *d, int fd, void *buf, size_t size, int where) \
|
|
- { \
|
|
- struct pci_access *a = d->access; \
|
|
- int r; \
|
|
- if (a->fd_pos != where && lseek(fd, where, SEEK_SET) < 0) \
|
|
- return -1; \
|
|
- r = op(fd, buf, size); \
|
|
- if (r < 0) \
|
|
- a->fd_pos = -1; \
|
|
- else \
|
|
- a->fd_pos = where + r; \
|
|
- return r; \
|
|
- }
|
|
-make_rw_glue(read)
|
|
-make_rw_glue(write)
|
|
-#define HAVE_DO_READ
|
|
-#endif
|
|
-
|
|
#ifndef HAVE_DO_READ
|
|
#define do_read(d,f,b,l,p) pread(f,b,l,p)
|
|
#define do_write(d,f,b,l,p) pwrite(f,b,l,p)
|
|
--- pciutils-2.1.11/lib/proc.c.pread 2003-11-21 18:27:23.749508565 -0500
|
|
+++ pciutils-2.1.11/lib/proc.c 2003-11-21 18:27:43.341951711 -0500
|
|
@@ -19,60 +19,6 @@
|
|
|
|
#include "internal.h"
|
|
|
|
-/*
|
|
- * We'd like to use pread/pwrite for configuration space accesses, but
|
|
- * unfortunately it isn't simple at all since all libc's until glibc 2.1
|
|
- * don't define it.
|
|
- */
|
|
-
|
|
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
|
|
-/* glibc 2.1 or newer -> pread/pwrite supported automatically */
|
|
-
|
|
-#elif defined(i386) && defined(__GLIBC__)
|
|
-/* glibc 2.0 on i386 -> call syscalls directly */
|
|
-#include <asm/unistd.h>
|
|
-#include <syscall-list.h>
|
|
-#ifndef SYS_pread
|
|
-#define SYS_pread 180
|
|
-#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 181
|
|
-#endif
|
|
-static int pwrite(unsigned int fd, void *buf, size_t size, loff_t where)
|
|
-{ return syscall(SYS_pwrite, fd, buf, size, where); }
|
|
-
|
|
-#elif defined(i386)
|
|
-/* old libc on i386 -> call syscalls directly the old way */
|
|
-#include <asm/unistd.h>
|
|
-static _syscall5(int, pread, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
|
|
-static _syscall5(int, pwrite, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
|
|
-static int do_read(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pread(fd, buf, size, where, 0); }
|
|
-static int do_write(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pwrite(fd, buf, size, where, 0); }
|
|
-#define HAVE_DO_READ
|
|
-
|
|
-#else
|
|
-/* In all other cases we use lseek/read/write instead to be safe */
|
|
-#define make_rw_glue(op) \
|
|
- static int do_##op(struct pci_dev *d, int fd, void *buf, size_t size, int where) \
|
|
- { \
|
|
- struct pci_access *a = d->access; \
|
|
- int r; \
|
|
- if (a->fd_pos != where && lseek(fd, where, SEEK_SET) < 0) \
|
|
- return -1; \
|
|
- r = op(fd, buf, size); \
|
|
- if (r < 0) \
|
|
- a->fd_pos = -1; \
|
|
- else \
|
|
- a->fd_pos = where + r; \
|
|
- return r; \
|
|
- }
|
|
-make_rw_glue(read)
|
|
-make_rw_glue(write)
|
|
-#define HAVE_DO_READ
|
|
-#endif
|
|
-
|
|
#ifndef HAVE_DO_READ
|
|
#define do_read(d,f,b,l,p) pread(f,b,l,p)
|
|
#define do_write(d,f,b,l,p) pwrite(f,b,l,p)
|