diff options
Diffstat (limited to 'package/libpciaccess/patches')
-rw-r--r-- | package/libpciaccess/patches/patch-src_freebsd_pci_c | 18 | ||||
-rw-r--r-- | package/libpciaccess/patches/patch-src_linux_sysfs_c | 138 | ||||
-rw-r--r-- | package/libpciaccess/patches/patch-src_netbsd_pci_c | 18 | ||||
-rw-r--r-- | package/libpciaccess/patches/patch-src_openbsd_pci_c | 26 | ||||
-rw-r--r-- | package/libpciaccess/patches/patch-src_pciaccess_private_h | 10 | ||||
-rw-r--r-- | package/libpciaccess/patches/patch-src_solx_devfs_c | 10 | ||||
-rw-r--r-- | package/libpciaccess/patches/patch-src_x86_pci_c | 10 |
7 files changed, 0 insertions, 230 deletions
diff --git a/package/libpciaccess/patches/patch-src_freebsd_pci_c b/package/libpciaccess/patches/patch-src_freebsd_pci_c deleted file mode 100644 index 3a1c22fd1..000000000 --- a/package/libpciaccess/patches/patch-src_freebsd_pci_c +++ /dev/null @@ -1,18 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/freebsd_pci.c 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/freebsd_pci.c 2014-03-24 13:26:10.476152263 +0100 -@@ -579,6 +579,7 @@ pci_device_freebsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #elif defined(PCI_MAGIC_IO_RANGE) - ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, -@@ -588,6 +589,7 @@ pci_device_freebsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #else - return NULL; diff --git a/package/libpciaccess/patches/patch-src_linux_sysfs_c b/package/libpciaccess/patches/patch-src_linux_sysfs_c deleted file mode 100644 index eb91062c2..000000000 --- a/package/libpciaccess/patches/patch-src_linux_sysfs_c +++ /dev/null @@ -1,138 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/linux_sysfs.c 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/linux_sysfs.c 2014-03-24 21:01:44.000000000 +0100 -@@ -41,11 +41,12 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <limits.h> - #include <sys/mman.h> - #include <dirent.h> - #include <errno.h> - --#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#if defined(__i386__) || defined(__x86_64__) - #include <sys/io.h> - #else - #define inb(x) -1 -@@ -759,6 +760,7 @@ pci_device_linux_sysfs_open_device_io(st - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 0; - - return ret; - } -@@ -796,6 +798,7 @@ pci_device_linux_sysfs_open_legacy_io(st - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - - return ret; - } -@@ -813,10 +816,14 @@ pci_device_linux_sysfs_read32(struct pci - { - uint32_t ret; - -- if (handle->fd > -1) -- pread(handle->fd, &ret, 4, port + handle->base); -- else -+ if (handle->fd > -1) { -+ if (handle->is_legacy) -+ pread(handle->fd, &ret, 4, port + handle->base); -+ else -+ pread(handle->fd, &ret, 4, port); -+ } else { - ret = inl(port + handle->base); -+ } - - return ret; - } -@@ -826,10 +833,14 @@ pci_device_linux_sysfs_read16(struct pci - { - uint16_t ret; - -- if (handle->fd > -1) -- pread(handle->fd, &ret, 2, port + handle->base); -- else -+ if (handle->fd > -1) { -+ if (handle->is_legacy) -+ pread(handle->fd, &ret, 2, port + handle->base); -+ else -+ pread(handle->fd, &ret, 2, port); -+ } else { - ret = inw(port + handle->base); -+ } - - return ret; - } -@@ -839,10 +850,14 @@ pci_device_linux_sysfs_read8(struct pci_ - { - uint8_t ret; - -- if (handle->fd > -1) -- pread(handle->fd, &ret, 1, port + handle->base); -- else -+ if (handle->fd > -1) { -+ if (handle->is_legacy) -+ pread(handle->fd, &ret, 1, port + handle->base); -+ else -+ pread(handle->fd, &ret, 1, port); -+ } else { - ret = inb(port + handle->base); -+ } - - return ret; - } -@@ -851,30 +866,42 @@ static void - pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port, - uint32_t data) - { -- if (handle->fd > -1) -- pwrite(handle->fd, &data, 4, port + handle->base); -- else -+ if (handle->fd > -1) { -+ if (handle->is_legacy) -+ pwrite(handle->fd, &data, 4, port + handle->base); -+ else -+ pwrite(handle->fd, &data, 4, port); -+ } else { - outl(data, port + handle->base); -+ } - } - - static void - pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port, - uint16_t data) - { -- if (handle->fd > -1) -- pwrite(handle->fd, &data, 2, port + handle->base); -- else -+ if (handle->fd > -1) { -+ if (handle->is_legacy) -+ pwrite(handle->fd, &data, 2, port + handle->base); -+ else -+ pwrite(handle->fd, &data, 2, port); -+ } else { - outw(data, port + handle->base); -+ } - } - - static void - pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port, - uint8_t data) - { -- if (handle->fd > -1) -- pwrite(handle->fd, &data, 1, port + handle->base); -- else -+ if (handle->fd > -1) { -+ if (handle->is_legacy) -+ pwrite(handle->fd, &data, 1, port + handle->base); -+ else -+ pwrite(handle->fd, &data, 1, port); -+ } else { - outb(data, port + handle->base); -+ } - } - - static int diff --git a/package/libpciaccess/patches/patch-src_netbsd_pci_c b/package/libpciaccess/patches/patch-src_netbsd_pci_c deleted file mode 100644 index 9b7a31b7e..000000000 --- a/package/libpciaccess/patches/patch-src_netbsd_pci_c +++ /dev/null @@ -1,18 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/netbsd_pci.c 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/netbsd_pci.c 2014-03-24 13:26:10.484152334 +0100 -@@ -733,6 +733,7 @@ pci_device_netbsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #elif defined(__amd64__) - struct x86_64_iopl_args ia; -@@ -743,6 +744,7 @@ pci_device_netbsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #else - return NULL; diff --git a/package/libpciaccess/patches/patch-src_openbsd_pci_c b/package/libpciaccess/patches/patch-src_openbsd_pci_c deleted file mode 100644 index 0c7180b72..000000000 --- a/package/libpciaccess/patches/patch-src_openbsd_pci_c +++ /dev/null @@ -1,26 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/openbsd_pci.c 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/openbsd_pci.c 2014-03-24 13:26:10.484152334 +0100 -@@ -412,6 +412,7 @@ pci_device_openbsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #elif defined(__amd64__) - struct amd64_iopl_args ia; -@@ -422,6 +423,7 @@ pci_device_openbsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #elif defined(PCI_MAGIC_IO_RANGE) - ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, -@@ -431,6 +433,7 @@ pci_device_openbsd_open_legacy_io(struct - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - #else - return NULL; diff --git a/package/libpciaccess/patches/patch-src_pciaccess_private_h b/package/libpciaccess/patches/patch-src_pciaccess_private_h deleted file mode 100644 index e3ec7d0f1..000000000 --- a/package/libpciaccess/patches/patch-src_pciaccess_private_h +++ /dev/null @@ -1,10 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/pciaccess_private.h 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/pciaccess_private.h 2014-03-24 13:26:10.492152406 +0100 -@@ -109,6 +109,7 @@ struct pci_io_handle { - pciaddr_t size; - void *memory; - int fd; -+ int is_legacy; - }; - - struct pci_device_private { diff --git a/package/libpciaccess/patches/patch-src_solx_devfs_c b/package/libpciaccess/patches/patch-src_solx_devfs_c deleted file mode 100644 index f6ee2c03e..000000000 --- a/package/libpciaccess/patches/patch-src_solx_devfs_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/solx_devfs.c 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/solx_devfs.c 2014-03-24 13:26:10.496152442 +0100 -@@ -911,6 +911,7 @@ pci_device_solx_devfs_open_legacy_io(str - if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) == 0) { - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - return ret; - } - #endif diff --git a/package/libpciaccess/patches/patch-src_x86_pci_c b/package/libpciaccess/patches/patch-src_x86_pci_c deleted file mode 100644 index 07c18d419..000000000 --- a/package/libpciaccess/patches/patch-src_x86_pci_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libpciaccess-0.13.2.orig/src/x86_pci.c 2013-07-21 00:54:34.000000000 +0200 -+++ libpciaccess-0.13.2/src/x86_pci.c 2014-03-24 13:26:10.496152442 +0100 -@@ -558,6 +558,7 @@ pci_device_x86_open_legacy_io(struct pci - - ret->base = base; - ret->size = size; -+ ret->is_legacy = 1; - - return ret; - } |