Alan Coopersmith [Sat, 20 Jul 2013 22:00:40 +0000 (15:00 -0700)]
Resync COPYING file with copyrights/licenses from code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Sat, 6 Jul 2013 17:09:31 +0000 (10:09 -0700)]
pci_device_solx_devfs_probe: implicit conversion changes signedness warnings
solx_devfs.c:615:32: warning: implicit conversion changes signedness:
'unsigned long' to 'int' [-Wsign-conversion]
for (i = 0; i < len; i = i + CELL_NUMS_1275) {
~ ~~^~~~~~~~~~~~~~~~
solx_devfs.c:615:30: warning: implicit conversion changes signedness:
'int' to 'unsigned long' [-Wsign-conversion]
for (i = 0; i < len; i = i + CELL_NUMS_1275) {
^ ~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Sat, 6 Jul 2013 17:00:44 +0000 (10:00 -0700)]
Solaris: Remove #defines for Ultra 45 southbridge device ids
Workaround for these chipsets was removed in commit
d76fb36d9c28be0f7c
with the switch of probing methods from the PCI address poking that upset
them to using the already collected data from the kernel via devinfo,
but the #define to identify them was left behind unused - remove it too.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Sat, 6 Jul 2013 16:56:46 +0000 (09:56 -0700)]
pci_device_solx_devfs_read: fix sign conversion/comparison warnings
Fixes:
solx_devfs.c:824:19: warning: comparison of integers of different signs: 'int' and 'pciaddr_t' (aka 'unsigned long') [-Wsign-compare]
for (i = 0; i < size; i += PCITOOL_ACC_ATTR_SIZE(PCITOOL_ACC_ATTR_SIZE_1))
~ ^ ~~~~
solx_devfs.c:826:28: warning: implicit conversion changes signedness: 'int' to 'unsigned long' [-Wsign-conversion]
cfg_prg.offset = offset + i;
~ ^
solx_devfs.c:844:19: warning: implicit conversion changes signedness: 'int' to 'pciaddr_t' (aka 'unsigned long') [-Wsign-conversion]
*bytes_read = i;
~ ^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Thomas Klausner [Sat, 29 Jun 2013 18:49:54 +0000 (20:49 +0200)]
Support more pci functions on NetBSD.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Thomas Klausner [Sat, 29 Jun 2013 18:49:53 +0000 (20:49 +0200)]
Fix build on NetBSD-4.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Thomas Klausner [Sat, 29 Jun 2013 18:49:52 +0000 (20:49 +0200)]
Enable boot_vga support only if WSDISPLAYIO_GET_BUSID is defined.
Fixes build on NetBSD-5.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Tue, 25 Jun 2013 04:20:27 +0000 (21:20 -0700)]
pci_id_file_open: move variable inside the #ifndef that uses it
Clears up gcc warning on Solaris:
common_device_name.c: In function 'pci_id_file_open':
common_device_name.c:83:17: warning: unused variable 'result' [-Wunused-variable]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Tue, 25 Jun 2013 04:09:52 +0000 (21:09 -0700)]
Define PCI_MATCH_ANY as an unsigned int
Clears a bunch of clang warnings of the forms:
common_device_name.c:345:23: warning: comparison of integers of different signs:
'const uint32_t' (aka 'const unsigned int') and 'int' [-Wsign-compare]
if ( m->vendor_id == PCI_MATCH_ANY ) {
~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~
common_device_name.c:498:19: warning: implicit conversion changes signedness:
'int' to 'uint32_t' (aka 'unsigned int') [-Wsign-conversion]
m.device_id = PCI_MATCH_ANY;
~ ^~~~~~~~~~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Thomas Klausner [Tue, 11 Jun 2013 09:46:26 +0000 (11:46 +0200)]
Update NetBSD support.
Signed-off-by: Michael Lorenz <macallan@NetBSD.org>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Thomas Klausner [Tue, 11 Jun 2013 09:45:50 +0000 (11:45 +0200)]
Move 'const' to correct place, so it has meaning.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Thomas Klausner [Sun, 2 Jun 2013 20:38:39 +0000 (22:38 +0200)]
Protect config.h like usual.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Sat, 8 Jun 2013 03:31:37 +0000 (20:31 -0700)]
Bug 63583 - add legacy IO routines for FreeBSD
https://bugs.freedesktop.org/show_bug.cgi?id=63583
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Henry Zhao [Fri, 11 Jan 2013 01:53:09 +0000 (17:53 -0800)]
Solaris: probe improvement
Remove pcitool dependency in probing phase. Use the data
collected from devinfo tree instead in creating pci file
system.
Signed-off-by: Henry Zhao <henzhao@glory3.(none)>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Henry Zhao [Tue, 18 Dec 2012 23:10:46 +0000 (15:10 -0800)]
Solaris: Add domain support for sparc platform
As a result the code of finding nexus node for a device in sparc is
simplified and made the same as x86.
Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Colin Walters [Wed, 4 Jan 2012 22:37:06 +0000 (17:37 -0500)]
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Tue, 15 Jan 2013 19:28:48 +0000 (14:28 -0500)]
configure: Remove AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
Egbert Eich [Mon, 4 Jul 2011 05:38:33 +0000 (07:38 +0200)]
PCI: set correct mask value when matching for bridges.
The mask must not be zero otherwise the matching condition will never
be true: ((val & mask) == set).
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Guillem Jover <guillem@hadrons.org>
Henry Zhao [Sat, 7 Apr 2012 00:26:59 +0000 (17:26 -0700)]
scanpci: print meaningful info on BASEROM
Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Henry Zhao [Fri, 6 Apr 2012 23:52:42 +0000 (16:52 -0700)]
libpciaccess: sparc rom read fix
Get rom address and size from device's "assigned-addresses" property
if they exist.
Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Henry Zhao [Fri, 5 Oct 2012 19:41:36 +0000 (12:41 -0700)]
libpciaccess: implementation of boot_vga in Solaris
Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Mark Logan [Tue, 18 Sep 2012 20:28:18 +0000 (13:28 -0700)]
libpciaccess: fix memory usage errors
This patch fixes memory usage errors that only occur on large SPARC
machines with more than 256 PCI devices. In this case, memory is being
used after it has been freed by calls to both free() and realloc().
This error was introduced by a previous patch:
2011-03-30 Solaris support for multiple PCI segments (domains)
Signed-off-by: Mark Logan <mark.logan@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Samuel Thibault [Thu, 31 May 2012 18:00:34 +0000 (20:00 +0200)]
Implement legacy io & map for x86 backend
Add the legacy io and map methods for the x86 backend, using ioperm,
in/out, and the existing mmap method.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Alan Coopersmith [Thu, 19 Apr 2012 05:17:54 +0000 (22:17 -0700)]
Solaris: refactor pci_device_solx_devfs_map_range to reduce code duplication
The sparc & x86 cases were doing essentially the same things with
different paths, so make the path setup be inside the platform
specific #ifdefs, make the open, mmap, & error handling common code.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Wed, 18 Apr 2012 22:30:30 +0000 (15:30 -0700)]
Solaris: Implement map_legacy & legacy_io functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jay Cotton <jay.cotton@oracle.com>
Julien Cristau [Mon, 9 Apr 2012 17:05:27 +0000 (19:05 +0200)]
Bump to 0.13.1
Signed-off-by: Julien Cristau <jcristau@debian.org>
Matthieu Herrb [Mon, 2 Apr 2012 06:22:23 +0000 (08:22 +0200)]
Fix pci_io_handle allocation routines.
The previous version of new_io_handle() would invalidate all previous
allocations when realloc moves the base pointer of the ios array.
Since I cannot figure out where this array is useful, just get rid of
it, providing sound stable memory allocation.
Fixes vgaHWSaveFonts() in 1.12 xserver on OpenBSD, but other
sub-systems relaying on pci_io could be affected too.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Tested-by: Tormod Volden <debian.tormod@gmail.com>
Thordur Bjornsson [Wed, 14 Mar 2012 13:45:52 +0000 (14:45 +0100)]
Fix openbsd_pci.c:pci_device_vgaarb_set_target();
A return (0) got lost, add it back.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Adam Jackson [Mon, 5 Mar 2012 16:01:01 +0000 (11:01 -0500)]
linux: Fix out[bwl] macros on non-I/O architectures
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Mon, 5 Mar 2012 16:00:14 +0000 (11:00 -0500)]
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
Jeremy Huddleston [Sun, 4 Mar 2012 02:19:11 +0000 (18:19 -0800)]
configure.ac: Bump to 0.13
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Adam Jackson [Mon, 27 Feb 2012 16:19:50 +0000 (11:19 -0500)]
Use O_CLOEXEC for internal file descriptors
Well, almost all of them. zlib doesn't support "e" in the mode string
in gzopen() though it will silently accept and ignore it, and Solaris appears
not to support "e" in the mode string at all.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Mon, 27 Feb 2012 15:43:20 +0000 (10:43 -0500)]
linux: Don't use /dev/port
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Mathias Krause [Fri, 24 Feb 2012 08:39:31 +0000 (09:39 +0100)]
Use correct type for pci_id file accessor functions
This fixes the compiler warning of using the wrong type for gzgets() and
gzclose() as they want a gzFile argument, not a pointer to gzFile. The
abstraction layer pci_id_file should just abstract the full type.
Signed-off-by: Mathias Krause <mathias.krause@secunet.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Alan Coopersmith [Thu, 9 Feb 2012 06:14:08 +0000 (22:14 -0800)]
solx_devfs.c: fix gcc warnings about casting away const when reading data
solx_devfs.c: In function `pci_device_solx_devfs_write':
solx_devfs.c:1085: warning: cast discards qualifiers from pointer target type
solx_devfs.c:1089: warning: cast discards qualifiers from pointer target type
solx_devfs.c:1093: warning: cast discards qualifiers from pointer target type
solx_devfs.c:1097: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Thu, 9 Feb 2012 06:08:08 +0000 (22:08 -0800)]
Close pci.ids file when bailing out because realloc failed
Error: File Leak
Leaked File f
at line 272 of src/common_device_name.c in function 'populate_vendor'.
f initialized at line 204 with fopen("/usr/share/hwdata/pci.ids", "r").
[ This bug was found by the Parfait 0.5.0 bug checking tool.
For more information see http://labs.oracle.com/projects/parfait/ ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Thu, 9 Feb 2012 05:40:54 +0000 (21:40 -0800)]
Solaris: reorder functions to remove need for lots of static prototypes
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Mark Kettenis [Thu, 29 Dec 2011 20:14:44 +0000 (21:14 +0100)]
OpenBSD: Implement map_legacy and legacy_io
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Daniel Drake [Fri, 25 Nov 2011 18:28:48 +0000 (12:28 -0600)]
delete_io_handle: fix deletion of last handle
When num_ios goes from 1 to 0, a realloc(ios, 0); call is made.
This is equivalent to free(ios) and NULL is returned.
However, the previous logic in the code incorrectly discards this NULL
return value. When we next call new_io_handle(), realloc(ios, X) is
called with "ios" pointing to freed memory. This causes glibc to abort.
Correct this logic to detect the 1-to-0 case and handle it correctly.
Other cases are unchanged; there is still value in checking the
return value from realloc() as it also returns NULL on error.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Mark Kettenis [Sun, 6 Nov 2011 17:34:29 +0000 (17:34 +0000)]
Add VGA Arbiter support for OpenBSD.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Mark Kettenis [Sun, 6 Nov 2011 17:32:51 +0000 (17:32 +0000)]
OpenBSD: Indicate that devices need access to legacy VGA resources.
Makes sure xserver disables DRI if the VGA arbiter is in use.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Henry Zhao [Tue, 15 Nov 2011 02:53:21 +0000 (18:53 -0800)]
Solaris: improve support for sparc platform
(1) added prom property retrieval on sparc
(2) added multiple domain support on sparc
(3) use kernel device as mapping device
(4) performance improvements by removing redundant ioctl
Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Jeremy Huddleston [Wed, 9 Nov 2011 17:27:49 +0000 (09:27 -0800)]
configure.ac: Bump to 0.12.902
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Wed, 9 Nov 2011 17:46:30 +0000 (09:46 -0800)]
Fix some -Wformat errors in scanpci
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Nithin Nayak Sujir [Mon, 24 Oct 2011 19:15:15 +0000 (12:15 -0700)]
libpciaccess: close mtrr fd on pci_cleanup
Since the fd is not closed, calling pci_system_init and
pci_system_cleanup more than 1024 times results in "too many files open"
error.
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Alan Coopersmith [Wed, 5 Oct 2011 04:46:05 +0000 (21:46 -0700)]
Solaris: Give better error on realloc failure
commit
a18460b385ae03 converted from a fixed maximum number of devices
to dynamically growing the list via realloc, but didn't update the
error message shown on failure.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Jeremy Huddleston [Tue, 11 Oct 2011 17:22:49 +0000 (10:22 -0700)]
linux sysfs: Fix read-write access in map_legacy
O_RDONLY | O_WRONLY != O_RDWR
><
Reported-by: Javier Pello <javier.pello@urjc.es>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Sun, 9 Oct 2011 10:53:05 +0000 (03:53 -0700)]
scanpci: Build fix for systems without <err.h>
https://bugs.freedesktop.org/show_bug.cgi?id=31133
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Fri, 7 Oct 2011 18:57:26 +0000 (11:57 -0700)]
configure.ac: Bump version to 0.12.901
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Fri, 7 Oct 2011 18:56:06 +0000 (11:56 -0700)]
Update library version to reflect new API
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Adam Jackson [Tue, 10 May 2011 21:56:35 +0000 (17:56 -0400)]
linux: Implement map_legacy
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Adam Jackson [Tue, 10 May 2011 21:56:34 +0000 (17:56 -0400)]
Add map_legacy interface
This allows platforms to hand back mmaps of the low 1M (ISA) address
space on a per-domain basis.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Alan Coopersmith [Sat, 17 Sep 2011 05:11:38 +0000 (22:11 -0700)]
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Adam Jackson [Wed, 3 Aug 2011 22:35:11 +0000 (18:35 -0400)]
linux: Fix a crash in populate_devices
If scandir returns -1, the 'devices' array won't be initialized, and
attempting to free() it will crash.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Chris Wilson [Sat, 4 Jun 2011 11:30:06 +0000 (12:30 +0100)]
linux: Only set errno after an error
errno is only valid after an error, and was being filled with a garbage
value upon eof.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
John Martin [Tue, 29 Mar 2011 00:51:19 +0000 (17:51 -0700)]
Solaris support for multiple PCI segments (domains)
1. Removed hardcoded maximum size of 256 PCI devices, which is
too small for large systems. The number of devices is dynamically
resized as needed.
2. pci_device_solx_devfs_probe() no longer walks the device tree
from the very top ("/") but instead starts at the nexus which
owns the bus. Performance optimization for systems with multiple
bus nodes (including systems with just one segment/domain).
3. Added support for multiple domains/segments. Code tested
on kernels with and without multiple segment support so it should
be safe to integrate independent of the kernel version.
Signed-off-by: John Martin <John.M.Martin@Oracle.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Gaetan Nadon [Thu, 3 Feb 2011 22:38:32 +0000 (17:38 -0500)]
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
Update X.Org util-macros to version 1.8
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Alan Coopersmith [Thu, 3 Feb 2011 04:50:17 +0000 (20:50 -0800)]
libpciaccess 0.12.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Gaetan Nadon [Fri, 28 Jan 2011 21:07:07 +0000 (16:07 -0500)]
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
This silences an Automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Alan Coopersmith [Fri, 14 Jan 2011 06:05:02 +0000 (22:05 -0800)]
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Alan Coopersmith [Fri, 14 Jan 2011 05:58:02 +0000 (21:58 -0800)]
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR
Replace obsolete argument to AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Bryce Harrington [Tue, 14 Dec 2010 17:03:48 +0000 (12:03 -0500)]
Fix detection of multi-function cards
Bit 7 of the pci device header type is an indicator of multi-function
devices, so needs to be masked when examining the bridge type.
Thanks go to Chih-Pin Wu for finding the bug and its fix.
https://bugs.launchpad.net/ubuntu/+source/libpciaccess/+bug/681207
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Jesse Barnes [Mon, 6 Dec 2010 20:18:19 +0000 (12:18 -0800)]
Revert "Don't try to use bogus bridge data"
This reverts commit
2bda5b733bb12854760750c08138db95e77aea0c.
It actually conflicts with
9ba94caf57e3a8c3e9c6f3f5f068f4a7a7b3ff9d
which came earlier, but I didn't catch it probably because I did a blind
rebase before pushing.
When reading bridge bus info, we may need to read out the current bridge
info if the PCI bridge private is uninitialized, so remove the check at
the top that would always short circuit the case where the priv was
still 0.
References:
https://bugs.launchpad.net/ubuntu/+source/libpciaccess/+bug/681207.
Reported-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Alan Coopersmith [Sun, 21 Nov 2010 19:14:05 +0000 (11:14 -0800)]
Sun's copyrights belong to Oracle now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Gaetan Nadon [Fri, 15 Oct 2010 21:34:16 +0000 (17:34 -0400)]
config: use LDADD to obtain appropriate dependencies
In generated scanpci/Makefile, this line is added:
scanpci_DEPENDENCIES = $(top_builddir)/src/libpciaccess.la
If the content of the library changes, the tool will rebuild.
When scanpci was in the same directory as the library, the .la file was used.
This will also ensure the "installed" pciaccess library is not used.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sun, 26 Sep 2010 18:57:19 +0000 (14:57 -0400)]
include: add a Makefile to install and distribute header file
Makefiles are simpler when they only handle what is in their
directory.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sun, 26 Sep 2010 18:42:50 +0000 (14:42 -0400)]
config: replace INCLUDES, which is deprecated, with AM_CPPFLAGS
Fixes an Automake warning.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sun, 22 Aug 2010 12:10:23 +0000 (08:10 -0400)]
config: provide a makefile for scanpci man pages
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sun, 26 Sep 2010 12:39:57 +0000 (08:39 -0400)]
scanpci.c: remove offending whitespace as reported by git diff
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sun, 22 Aug 2010 12:10:23 +0000 (08:10 -0400)]
config: provide a makefile for scanpci dev tool
No function changes.
Note that automake generates a wrapper script if libpciaccess
is not installed at configuration time, which is the most common case.
If it is installed at configuration time, you get an executable.
The makefile build order ensures the lib is build before scanpci.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sat, 21 Aug 2010 23:54:04 +0000 (19:54 -0400)]
config: upgrade AC_DEFINE_DIR to AX_DEFINE_DIR
Use the latest version now hosted by GNU.
The renaming protects Autoconf namespace.
There is no functional change in the macro.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Dave Airlie [Tue, 20 Jul 2010 23:39:26 +0000 (09:39 +1000)]
libpciaccess 0.12.0 - bump version for release
Thomas Hellstrom [Tue, 20 Jul 2010 20:14:22 +0000 (22:14 +0200)]
Fix long standing MTRR bug.
Add an include that makes the file common_vgaarb.c see the same
struct pci_system as the file linux_sysfs.c.
Without this fix, on a MTRR system, the vgaarb_fd member
would overwrite the mtrr_fd member and cause the MTRR_IOC_ADD_ENTRY call
to be issued to the incorrect device causing the infamous
"Inappropriate ioctl for device (25)" error.
This error would cause MTRR setup to fail on all systems relying on it
and is severe enough to warrant a new release.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Mon, 12 Jul 2010 03:09:33 +0000 (13:09 +1000)]
pciaccess: fix use after free.
Using the pointer passed to realloc earlier isn't a recipe for success.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Alan Coopersmith [Sat, 19 Jun 2010 17:36:24 +0000 (10:36 -0700)]
Let libtool handle library flags for scanpci on Solaris
Stop hardcoding -ldevinfo since configure/libtool already know to add it
for static linking, and ELF dependencies handle it for dynamic linking
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tiago Vignatti [Sat, 22 May 2010 15:23:33 +0000 (18:23 +0300)]
vgaarb: read back vga count when setting new decoding
Decode kernel operation can also change vga refcount, so we need to read back
the information when calling it.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tiago Vignatti [Wed, 12 May 2010 10:12:47 +0000 (13:12 +0300)]
vgaarb: decode should send new information to the kernel
This was introduced in
e360c11c.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Alan Coopersmith [Fri, 4 Jun 2010 23:58:56 +0000 (16:58 -0700)]
Delay allocation of agp_info so we don't leak it on prior errors
Memory leak of pointer 'agp_info'
at line 119 of src/common_capability.c in function 'pci_fill_capabilities_generic'.
'agp_info' allocated at line 107 with calloc(1, 12).
'agp_info' leaks when err != 0 at line 118.
at line 124 of src/common_capability.c in function 'pci_fill_capabilities_generic'.
'agp_info' allocated at line 107 with calloc(1, 12).
'agp_info' leaks when err != 0 at line 123.
[ This bug was found by the Parfait bug checking tool.
For more information see http://research.sun.com/projects/parfait ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Gaetan Nadon [Mon, 29 Mar 2010 20:50:34 +0000 (16:50 -0400)]
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Mon, 29 Mar 2010 18:53:49 +0000 (14:53 -0400)]
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Samuel Thibault [Tue, 19 Jan 2010 17:37:43 +0000 (18:37 +0100)]
libpciaccess x86 backend
This adds support on x86 for OSes that do not have a PCI interface,
tinkering with I/O ports, and makes use of it on GNU/Hurd.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Julien Cristau [Sun, 17 Jan 2010 14:33:13 +0000 (14:33 +0000)]
COPYING: add Red Hat's copyright notice
Alan Coopersmith [Fri, 15 Jan 2010 04:48:20 +0000 (20:48 -0800)]
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Adam Jackson [Mon, 14 Dec 2009 22:27:12 +0000 (17:27 -0500)]
libpciaccess 0.11.0
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Mon, 14 Dec 2009 21:26:31 +0000 (16:26 -0500)]
Fix I/O handle array allocator to work for devices past the first
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Mon, 14 Dec 2009 21:19:35 +0000 (16:19 -0500)]
Fix pci_device_open_io() to actually return something useful
Remember, code review just means we're all inept.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Wed, 18 Nov 2009 18:53:49 +0000 (13:53 -0500)]
I/O port access routines
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Adam Jackson [Wed, 18 Nov 2009 19:12:57 +0000 (14:12 -0500)]
Add pci_device_get_parent_bridge()
Copied from linuxPci.c in the X server.
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Gaetan Nadon [Sat, 28 Nov 2009 01:56:05 +0000 (20:56 -0500)]
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
Gaetan Nadon [Wed, 28 Oct 2009 18:09:10 +0000 (14:09 -0400)]
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
Gaetan Nadon [Tue, 27 Oct 2009 19:07:25 +0000 (15:07 -0400)]
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
Gaetan Nadon [Tue, 27 Oct 2009 02:08:43 +0000 (22:08 -0400)]
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
Gaetan Nadon [Thu, 22 Oct 2009 16:34:20 +0000 (12:34 -0400)]
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
Dave Airlie [Fri, 25 Sep 2009 00:25:56 +0000 (10:25 +1000)]
shutup stupid gcc warning, strtok_r ignores the first parameter
Dave Airlie [Fri, 25 Sep 2009 00:19:07 +0000 (10:19 +1000)]
libpciaccess 0.10.9
Tiago Vignatti [Fri, 18 Sep 2009 12:21:19 +0000 (15:21 +0300)]
vgaarb: fix newbie typo
Eh, we don't need to check for the fd anyway. Kudos jcristau for reporting.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tiago Vignatti [Wed, 16 Sep 2009 09:56:53 +0000 (12:56 +0300)]
vgaarb: check for fd before close it
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Keith Packard [Fri, 18 Sep 2009 00:38:56 +0000 (17:38 -0700)]
Free return value from scandir instead of leaking it.
Scandir is defined to return pointers to malloc'd storage, so make
sure that memory is nicely freed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Dave Airlie [Wed, 2 Sep 2009 09:03:11 +0000 (19:03 +1000)]
vgaarb: check pci_sys exists before initing vga arb
Dave Airlie [Sun, 30 Aug 2009 23:14:16 +0000 (09:14 +1000)]
pciaccess: bump to 0.10.8