summaryrefslogtreecommitdiff
path: root/package/libpciaccess/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/libpciaccess/patches')
-rw-r--r--package/libpciaccess/patches/patch-src_freebsd_pci_c18
-rw-r--r--package/libpciaccess/patches/patch-src_linux_sysfs_c139
-rw-r--r--package/libpciaccess/patches/patch-src_netbsd_pci_c18
-rw-r--r--package/libpciaccess/patches/patch-src_openbsd_pci_c26
-rw-r--r--package/libpciaccess/patches/patch-src_pciaccess_private_h10
-rw-r--r--package/libpciaccess/patches/patch-src_solx_devfs_c10
-rw-r--r--package/libpciaccess/patches/patch-src_x86_pci_c10
7 files changed, 221 insertions, 10 deletions
diff --git a/package/libpciaccess/patches/patch-src_freebsd_pci_c b/package/libpciaccess/patches/patch-src_freebsd_pci_c
new file mode 100644
index 000000000..3a1c22fd1
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_freebsd_pci_c
@@ -0,0 +1,18 @@
+--- 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
index ad31ac509..eb91062c2 100644
--- a/package/libpciaccess/patches/patch-src_linux_sysfs_c
+++ b/package/libpciaccess/patches/patch-src_linux_sysfs_c
@@ -1,14 +1,11 @@
---- libpciaccess-0.13.1.orig/src/linux_sysfs.c 2012-04-09 19:02:57.000000000 +0200
-+++ libpciaccess-0.13.1/src/linux_sysfs.c 2013-12-01 18:26:04.000000000 +0100
-@@ -34,6 +34,7 @@
-
- #define _GNU_SOURCE
-
+--- 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 <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-@@ -45,7 +46,7 @@
+ #include <sys/mman.h>
#include <dirent.h>
#include <errno.h>
@@ -17,3 +14,125 @@
#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
new file mode 100644
index 000000000..9b7a31b7e
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_netbsd_pci_c
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000..0c7180b72
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_openbsd_pci_c
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 000000000..e3ec7d0f1
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_pciaccess_private_h
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000..f6ee2c03e
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_solx_devfs_c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000..07c18d419
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_x86_pci_c
@@ -0,0 +1,10 @@
+--- 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;
+ }
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 05:05:03 +0000