Module Name: xsrc
Committed By: mrg
Date: Sun Jul 19 23:32:00 UTC 2015
Modified Files:
xsrc/external/mit/libpciaccess/dist/src: common_interface.c
netbsd_pci.c
Log Message:
merge libpciaccess 0.13.4.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libpciaccess/dist/src/common_interface.c
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libpciaccess/dist/src/common_interface.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_interface.c:1.4 xsrc/external/mit/libpciaccess/dist/src/common_interface.c:1.5
--- xsrc/external/mit/libpciaccess/dist/src/common_interface.c:1.4 Wed Jun 12 09:59:11 2013
+++ xsrc/external/mit/libpciaccess/dist/src/common_interface.c Sun Jul 19 23:32:00 2015
@@ -36,7 +36,7 @@
#include "pciaccess.h"
#include "pciaccess_private.h"
-#if defined(__linux__) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__GLIBC__) || defined(__CYGWIN__)
#include <byteswap.h>
#if __BYTE_ORDER == __BIG_ENDIAN
Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.14 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.15
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.14 Fri Jul 25 01:39:32 2014
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c Sun Jul 19 23:32:00 2015
@@ -16,15 +16,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/types.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#ifdef HAVE_MTRR
#include <machine/sysarch.h>
#include <machine/mtrr.h>
@@ -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;
