ChangeLog | 516 +++++++++++++++++++++++++++++++++++++++++++++++ aclocal.m4 | 4 configure | 24 +- configure.ac | 3 debian/changelog | 7 debian/rules | 2 src/common_capability.c | 2 src/common_device_name.c | 5 src/common_init.c | 2 src/common_map.c | 2 src/freebsd_pci.c | 2 src/linux_devmem.c | 3 src/linux_sysfs.c | 2 src/pciaccess_private.h | 7 14 files changed, 556 insertions(+), 25 deletions(-)
New commits: commit e5114d5de66eeae3c188f406e7e6da36e57fc6a4 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Mar 7 14:44:43 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 60e59a6..bc28582 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libpciaccess (0.10-1) UNRELEASED; urgency=low +libpciaccess (0.10-1) unstable; urgency=low * New upstream release. * Install the upstream changelog. - -- Julien Cristau <[EMAIL PROTECTED]> Fri, 07 Mar 2008 14:33:19 +0100 + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 07 Mar 2008 14:43:39 +0100 libpciaccess (0.9.1+git20080219-1) unstable; urgency=low commit 781fba56e1009021fc99dfc182faf625bf2707b2 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Mar 7 14:35:18 2008 +0100 Update debian/changelog, add and install the upstream ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..28340f8 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,516 @@ +commit ac119e0b1d5fdbb6bd447b6cef1ddca59840fe40 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Thu Mar 6 15:31:51 2008 -0500 + + libpciaccess 0.10 + +commit 0ac748d0da1361075efa48a6238f2328d24ba1a8 +Author: Doug Chapman <[EMAIL PROTECTED]> +Date: Thu Mar 6 14:22:17 2008 -0500 + + Bug #14818: Actually return the PCI vendor name, instead of NULL. + +commit adc46f65d7a097ea0e8427a2496586a420c99d55 +Author: Julien Cristau <[EMAIL PROTECTED]> +Date: Tue Feb 19 14:45:40 2008 +0100 + + Don't export private symbols. + +commit 25de45d250811474e86cb9a09caf258aef699196 +Author: Julien Cristau <[EMAIL PROTECTED]> +Date: Tue Feb 19 14:26:54 2008 +0100 + + Use <byteswap.h> when using glibc, not just on linux + + This fixes the build on GNU/kFreeBSD. + +commit ceda00d33fbf3d491e3f7e53302acd2b8b74a305 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Dec 6 16:38:51 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit e392082abb5696c8837224da86cc0af4f21d7010 +Author: Matthias Hopf <[EMAIL PROTECTED]> +Date: Tue Oct 23 15:19:36 2007 +0200 + + Bit-fields have to have type _Bool, signed int, or unsigned int. + + ISO/IEC 9899:1999 (E), 6.7.2.1 Structure and union specifiers, (4). + _Bool is only supported for C99 and up, and 1-bit signed types don't make + sense -> unsigned int. + +commit 5b9ca552a17de37bbac84f0cf5b4430d108e576c +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Oct 18 15:59:14 2007 -0700 + + Update bug reporting link. + +commit 57a942b3cca314a56735e0a4198cac2f25b653dd +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Oct 10 15:20:51 2007 -0700 + + FreeBSD: for 64-bit BARs, skip the resource slot used for the upper 32 bits. + + This gets us the same resource numbering as on Linux. + +commit 127ae628a2090bb00df81adce831b8b031d3b4a8 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Oct 10 14:55:45 2007 -0700 + + FreeBSD: Don't try to unset an MTRR if we didn't set it. + +commit 28fea32f987a74d365d01bc5870a8bce1c393d59 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Oct 10 14:32:38 2007 -0700 + + Add domain output to scanpci. + +commit 393145db90578d7d598fccf949b249217066a67c +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Oct 10 14:32:09 2007 -0700 + + FreeBSD: Add support for multiple PCI domains. + +commit 7d809e149b59f22e24723db7360a4c38a9145b45 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Oct 9 12:13:49 2007 -0700 + + FreeBSD: Fix unmap_range to return an error value. + +commit 042735df2aa5846fcabfd74c5f73877132728b25 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Oct 9 12:12:34 2007 -0700 + + FreeBSD: don't set the MTRR if it's the default mode (uncacheable). + +commit 4bdaca5295eeacdaeb80f2e7d0fa17674dcbc77a +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Thu Sep 27 15:22:51 2007 -0700 + + Need to link with -ldevinfo on Solaris + +commit 63983e2397d813246b851771c13397ff700e239e +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Wed Sep 26 17:26:47 2007 -0700 + + Fix Solaris build: missing static prototype & typo in variable name + +commit 8c77862e70eac7f61cd402e9ef33a5b0ca1c6426 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Sep 11 15:07:55 2007 +0000 + + Add FreeBSD MTRR setting support. + +commit 82a2ff0bb091e097bacb66273f55a287afb15abf +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Tue Sep 4 16:13:24 2007 -0700 + + Add stub version of pci_device_map_memory_range + + This stub version of pci_device_map_memory_range allows the vesa driver and + other users of this interface to continue functioning with current + libpciaccess bits. That said, users of this interface should convert over + to pci_device_map_range as soon as possible. + +commit 9d1596cba90c8fd273e9d1d5488747cc0f34fdc7 +Merge: b1e9117... 5cf29b0... +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 06:15:58 2007 -0400 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libpciaccess + +commit b1e911784d314fdbd8d938e5fe3671bec128fb61 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 05:53:57 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 5cf29b06b9b5806056a0b04160b2286eb4158748 +Author: Keith Packard <[EMAIL PROTECTED]> +Date: Fri Aug 31 13:43:18 2007 -0700 + + Don't add MTRR for uncached regions. Remove MTRR on unmap. + + MTRR regions aren't needed for uncached mappings, so don't add them. Also, + when unmapping memory, remove the MTRR entry. + +commit ebc618e7508847307713a59aeeed337a9277629d +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Fri Aug 31 12:40:03 2007 -0700 + + Update / add comments in struct pci_mem_region. + +commit 08ff9f7fbd26dd2d0e30351b556c71c272f6be6c +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Aug 30 17:52:02 2007 -0700 + + New interfaces to map memory with MTRR (or similar) support. + + Added new functions pci_device_map_range and pci_device_unmap_range to + handle mapping of PCI device BARs. These new interfaces allow the + possiblity of MTRRs on platforms that support them. + + These additional APIs necessitated changing some internal interfaces. The + code for FreeBSD and Solaris has been updated but has not been compiled or + tested. + + Old interfaces are marked deprecated and will eventually be removed. + +commit c87273e8e20c8bff892ded31295dba103f27dd35 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Aug 28 16:02:46 2007 -0700 + + Make the base address printout of scanpci more usable. + +commit 47d625ccea7dbcd6b69009aa1ec64a96e97513f6 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Aug 27 16:41:52 2007 -0700 + + Bump version to 0.9.1 (sigh). + +commit 73197e09c924dabc18b8839180508584b97e03df +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Aug 27 16:41:21 2007 -0700 + + Add linux_devmem.h to file list. + +commit 5e595d09e7011b82a90f74b149a97bea23ddfbf0 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Aug 27 16:39:00 2007 -0700 + + Bump version to 0.9.0. + +commit b0c9558c97ee861af240a948c364807e628e49de +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Aug 23 21:31:50 2007 -0400 + + Remove deprecated .cvsignore files + +commit 4e6be0466ad973ee6f63e0cbed466a974908dce8 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Aug 3 16:47:09 2007 -0700 + + FreeBSD: Add VGA rom reading through /dev/mem. + +commit ae4aed2821161028dabd8381273f3803a24340ad +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Aug 3 10:46:55 2007 -0700 + + FreeBSD: Fill in the subdevice ID. + +commit 14e62c77bd1ae6ef1d4048df2da96eeff8f7538f +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Aug 3 10:40:53 2007 -0700 + + Make scanpci exit cleanly if pci_system_init() fails. + +commit a7faac3d2dc49a2130906fbeea3298f32bb9349f +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Jun 18 12:56:40 2007 -0700 + + Initial support for reading expansion ROM via VGA BIOS address. + +commit 206e29213f92dd639fb4814ed2f3b6ec27e6f985 +Author: edward shu <[EMAIL PROTECTED]> +Date: Wed Jun 6 23:05:56 2007 +0800 + + Libpciaccess on Solaris Initial integration + + Libpciaccess on Solaris Initial integration. It depends on devfs to access + pci configuration space, also xsvc is used for memory map. + +commit db56c640028d2f8072274f3eb603caa481103f4f +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Tue Mar 27 08:01:39 2007 -0700 + + Whitespace police. + +commit c6e72deddb3055167fff8007bf039be61e45849e +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Tue Mar 27 07:57:35 2007 -0700 + + Don't pci_device_probe until absolutely necessary. + +commit 28dc34c2a6045ab95183d708500009bd1eea1659 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Tue Mar 27 07:57:00 2007 -0700 + + Make sure header_type is available in read_bridge_info. + +commit 061a011ceffc13db3b147dd105d8b7c2edcc3bc8 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Tue Mar 27 07:56:16 2007 -0700 + + Populate device and vendor ID fields at device list creation. + +commit b36d737d92dbeee7951aded990fa52bac39b2a79 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Mar 6 10:48:51 2007 -0800 + + FreeBSD: Fix a couple of minor issues in cleanup paths. + +commit 09be109c223b93d74ea3cc7a12d9a22b44990a14 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Thu Mar 1 10:49:13 2007 -0800 + + FreeBSD: Add system cleanup function. + +commit f6502eee20205ec14ce6499251a28962cc36fdd6 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Feb 28 16:25:07 2007 -0800 + + FreeBSD: When mapping regions, use the region's base address, not 0. + +commit a4ec2f35ea5b4f74cf455be24f8ad25d4096ab98 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Feb 28 16:13:44 2007 -0800 + + Fix inverted protection typo for mmap in region mapping. + +commit 9819ae0c376db57a9de5fcbb2f1d4c3ee1ed2ea8 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Feb 28 15:42:24 2007 -0800 + + scanpci prototype warning fix + +commit e70b710133cc552df266d5046a53f7a241a569eb +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Wed Feb 28 15:39:38 2007 -0800 + + Update freebsd code for pci_device_cfg_write API change. + +commit d86245be3bd57b29e5b7561b3facecb3298fea3b +Author: George Sapountzis <[EMAIL PROTECTED]> +Date: Wed Nov 15 02:49:50 2006 +0200 + + scanpci: BIST line offsets were off by 4. + +commit cc1d08f113140010f49503adc4e7afe5db892a02 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Tue Jan 16 21:24:12 2007 -0800 + + Fix bad parameter to pci_device_cfg_write in pci_device_cfg_write_u8. + + When changing the interface of the pci_device_cfg_write_u* functions + in commit 37ce43c1804bad9c52b8316eaefd3a57b670ee29, I forgot to modify + pci_device_cfg_write_u8 to pass a pointer to data to + pci_device_cfg_write instead of just passing data. + +commit 54d40b528ab769c4e89aaca87d1728a6194e4378 +Merge: 37ce43c... 335d42f... +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Jan 15 11:18:29 2007 -0800 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libpciaccess + +commit 37ce43c1804bad9c52b8316eaefd3a57b670ee29 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Jan 15 11:18:19 2007 -0800 + + Convert pci_device_write_u* funtions to take a value instead of a pointer. + + At anholt's request, the pci_device_write_u* functions have been + converted to take the value to be written as a parameter instead of a + pointer to the value. + + Bump the version to 0.8.0. + +commit 335d42f637dd44461bc20ba599ca5dc4971b6eaa +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Jan 12 16:32:51 2007 -0800 + + Add support for getting region information on FreeBSD. + + This could stand a lot more testing -- all it has received is visual inspection + of scanpci output on one machine, with some differing results from XFree86 + scanpci output. + +commit 94355b6f49a61e7424ddc7ddfc70a9b344233a47 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Jan 12 14:15:29 2007 -0800 + + Open the pci device read-write so we can read and write config regs. + + With this, we can hook up the IRQ line information. It would probably be nice + to have an unpriveleged mode, but for now, write access is required. + +commit 253e7f672b8b311b18cf827cd12c9147bba8eb4c +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Jan 12 13:33:51 2007 -0800 + + Remove extra fallback definition of PCIIDS_PATH. + + PCIIDS_PATH should always be provided by configure.ac and config.h. + +commit 87ec7de307ab5bd395d01cdb4f8fdf231d9e769e +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Jan 12 13:13:27 2007 -0800 + + Fix many warnings and bugs in the freebsd implementation. + + With this, scanpci gives partially-sane results. + +commit 4f6e1a61fc0abe1865e147509af5f7f2bfcaf8f7 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Jan 12 13:11:21 2007 -0800 + + Enable more warnings when the compiler is GCC. + +commit c7ce8ee140b01931994030900c0e8238fbb0caa2 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Fri Jan 12 13:06:50 2007 -0800 + + Add pciaccess_private.h to _SOURCES so it gets included in the dist. + +commit c65aa7630802c8dfcc06a20e515ace31ab0d0e48 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Jan 11 21:40:57 2007 -0800 + + Add interfaces to map / unmap specific memory ranges, bump lib version to 0.7.0. + + Add pci_device_map_memory_range and pci_device_unmap_memory_range to + map and unmap specific memory ranges. The unmap bit is still a bit + hinkey (unmaps the whole BAR). Works so far for initial conversion of + VESA driver. Will need to be revisited. + +commit db4a12d09fba381f39af024418e913fb99c34935 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Jan 11 21:39:15 2007 -0800 + + Fix bad cast that caused bit truncation. + +commit 8948a6c3593d92a50a09baf568b69f164d7e7f59 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Nov 14 14:38:48 2006 -0800 + + Update .gitignores. + +commit 1d227d67d35aba4601c4ffd6a2947ee746d5dc47 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Nov 14 14:37:53 2006 -0800 + + Add missing newline at the end of the file. + +commit e29843d3b0ff5d32d8ab4bc84c58300782d189d3 +Merge: 07b09d9... d05da65... +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue Nov 14 14:37:46 2006 -0800 + + Merge branch 'origin' + + Conflicts: + + src/Makefile.am + +commit 07b09d930ed2b7eae299ae036ec30099374b95aa +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Jul 30 16:19:50 2006 -0700 + + Add the beginnings of a FreeBSD port. + +commit d05da6520a273ee4c2f0e11b5a9bac65b51835fe +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Thu Aug 10 09:46:07 2006 -0700 + + Fix a segfault in populate_vendor that was triggered when the pci.ids file + could not be opened. Thanks to Aaron Plattner for reporting this. Fix a + couple possible memory leaks in the same function. + +commit 27f0ffca71277371a0b6c0cd1a720a9ce9519da5 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Sun Jul 30 15:35:41 2006 -0700 + + Added some function preamble comments. + +commit cf1b4d3ddfcdbaeddefc42b6eb19eb85a0a1e454 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Jul 30 14:29:58 2006 -0700 + + Add endian macros for BSD. + +commit edf3908958eacc20162563b68aa45964f0e38b2c +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Jul 30 14:26:38 2006 -0700 + + Use ENXIO instead of ENODATA for pci reads returning less than desired. + +commit c0e31708e0446b33240d3e1ba3e36c26a618544c +Author: Ian Romanick <[EMAIL PROTECTED](none)> +Date: Tue Jul 25 15:36:52 2006 -0700 + + Add pci_device_get_bridge_buses, bump API version to 0.5.0. + +commit 2ba1a0e42928f82e678987c84598e1b9d8ba1ef9 +Author: Ian Romanick <[EMAIL PROTECTED](none)> +Date: Thu Jul 6 17:18:14 2006 -0700 + + Files missed (for reasons I still don't understand) on the previous + commit. REALLY add support for querying bridge information. Bump to + version 0.5.0. + +commit c0ff6e6141ee6ebb1f628931ae62f0fa8ef87061 +Author: Ian Romanick <[EMAIL PROTECTED](none)> +Date: Thu Jul 6 17:09:47 2006 -0700 + + Add support for querying bridge information. Bump to version 0.5.0. + +commit 2467b3c509c7e5b771ca21ee6317b2d72d481439 +Author: Ian Romanick <[EMAIL PROTECTED](none)> +Date: Thu Jul 6 17:07:18 2006 -0700 + + Fix byte ordering of the PCI class. + +commit 70a66689fc2e44e7cd693947ed5f3f2acb4b6587 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon May 22 16:10:37 2006 +0000 + + Fix foolish endianess bug. Bump to version 0.4.1. + +commit 64af050c3803ed61837d9e9109c7a4e239a5c0b8 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Wed Apr 12 22:56:50 2006 +0000 + + Bump to version 0.4.0. + Add multiple-inclusion protection. + Add new function to write masked bits to PCI config space. This mirrors + functionality currently available in X.org that is slated to be + removed. + Gut old regex based search mechanism with a new mechanism that is modeled + after the Linux kernel. In addition to searching for devices by device + / vendor ID, it is possible to search for devices by their domain / bus + / slot / function. + Fix serious bus in the reading of ROMs and in the unmapping of regions. The + main point is that the map routine depens on the pci_mem_region::memory + pointer being non-NULL only when the region is mapped. Therefore, the + unmap routine should set it to NULL after unmapping. + Update to use new search API. + +commit 5b4db5c392c123f71a7933bd94c789b5e23dd69a +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Mon Mar 27 18:08:42 2006 +0000 + + Remove src/pcils.c and src/Makefile.foo. Add src/scanpci.c. + Bump version to 0.3.0. + Replace pci_get_name with pci_get_strings. This function matches the + functionality provided by the Xorg scanpci module almost identically. + +commit 6b1e9fae2ab9979b2a3bb3137c5db4d92d2905c8 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Fri Mar 24 16:57:17 2006 +0000 + + Remove src/Makefile.foo from CVS since the generated Makefile can do + everything now. + +commit d890ded5312dc88455fd332e03a4f212ba587e9d +Author: Kristian Høgsberg <[EMAIL PROTECTED]> +Date: Mon Mar 20 20:13:34 2006 +0000 + + Add scanpci as a noinst target. + Drop from CVS. + +commit 5a04522a921cd8737ef921dfd49b750a8c64dfc9 +Author: Ian Romanick <[EMAIL PROTECTED]> +Date: Sat Mar 18 00:12:48 2006 +0000 + + Initial import of libpciaccess. diff --git a/debian/changelog b/debian/changelog index c7816ed..60e59a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libpciaccess (0.10-1) UNRELEASED; urgency=low + + * New upstream release. + * Install the upstream changelog. + + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 07 Mar 2008 14:33:19 +0100 + libpciaccess (0.9.1+git20080219-1) unstable; urgency=low * Add a symbols file for libpciaccess.so.0. diff --git a/debian/rules b/debian/rules index b23d09b..e2b566b 100755 --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,7 @@ binary-arch: build install dh_installdocs dh_install --sourcedir=debian/tmp --list-missing - dh_installchangelogs + dh_installchangelogs ChangeLog dh_link dh_strip #--dbg-package=$(PACKAGE)-dbg dh_compress commit 9cd4f7708386f514be8eb3eb6cf339561b86d015 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Mar 7 14:32:17 2008 +0100 autoreconf diff --git a/aclocal.m4 b/aclocal.m4 index e5c0bcd..037bb83 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -6717,14 +6717,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d . -f 1`], [Major version of this package]) - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], [$PVM], [Minor version of this package]) - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi diff --git a/configure b/configure index 8dab47e..afc7d3e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libpciaccess 0.10.0. +# Generated by GNU Autoconf 2.61 for libpciaccess 0.10. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpciaccess' PACKAGE_TARNAME='libpciaccess' -PACKAGE_VERSION='0.10.0' -PACKAGE_STRING='libpciaccess 0.10.0' +PACKAGE_VERSION='0.10' +PACKAGE_STRING='libpciaccess 0.10' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess' # Factoring default headers for most tests. @@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpciaccess 0.10.0 to adapt to many kinds of systems. +\`configure' configures libpciaccess 0.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpciaccess 0.10.0:";; + short | recursive ) echo "Configuration of libpciaccess 0.10:";; esac cat <<\_ACEOF @@ -1582,7 +1582,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpciaccess configure 0.10.0 +libpciaccess configure 0.10 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1596,7 +1596,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpciaccess $as_me 0.10.0, which was +It was created by libpciaccess $as_me 0.10, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ fi # Define the identity of the package. PACKAGE='libpciaccess' - VERSION='0.10.0' + VERSION='0.10' cat >>confdefs.h <<_ACEOF @@ -19928,7 +19928,7 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi @@ -19937,7 +19937,7 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MINOR $PVM _ACEOF - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi @@ -20395,7 +20395,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpciaccess $as_me 0.10.0, which was +This file was extended by libpciaccess $as_me 0.10, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20448,7 +20448,7 @@ Report bugs to <[EMAIL PROTECTED]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpciaccess config.status 0.10.0 +libpciaccess config.status 0.10 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" commit ac119e0b1d5fdbb6bd447b6cef1ddca59840fe40 Author: Adam Jackson <[EMAIL PROTECTED]> Date: Thu Mar 6 15:31:51 2008 -0500 libpciaccess 0.10 diff --git a/configure.ac b/configure.ac index 8e53427..8f4e55d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ - dnl (C) Copyright IBM Corporation 2006 dnl All Rights Reserved. dnl @@ -41,7 +40,7 @@ dnl refers to ${prefix}. Thus we have to use `eval' twice. AC_PREREQ([2.57]) -AC_INIT(libpciaccess, 0.10.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess], libpciaccess) +AC_INIT(libpciaccess, 0.10, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess], libpciaccess) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 0ac748d0da1361075efa48a6238f2328d24ba1a8 Author: Doug Chapman <[EMAIL PROTECTED]> Date: Thu Mar 6 14:22:17 2008 -0500 Bug #14818: Actually return the PCI vendor name, instead of NULL. diff --git a/src/common_device_name.c b/src/common_device_name.c index 66c2104..b105187 100644 --- a/src/common_device_name.c +++ b/src/common_device_name.c @@ -228,7 +228,7 @@ populate_vendor( struct pci_id_leaf * vend, int fill_device_data ) /* vendor_name may already be set from a previous invocation * of this function with fill_device_data = 0. */ - if (vend->vendor_name != NULL) { + if (vend->vendor_name == NULL) { vend->vendor_name = strdup( & buf[ num_tabs + 6 ] ); } commit adc46f65d7a097ea0e8427a2496586a420c99d55 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Feb 19 14:45:40 2008 +0100 Don't export private symbols. diff --git a/src/common_capability.c b/src/common_capability.c index 48f6ed4..31d59eb 100644 --- a/src/common_capability.c +++ b/src/common_capability.c @@ -59,7 +59,7 @@ * later to try again for the second capability. This could lead to memory * leaks or other quirky behavior. */ -int +_pci_hidden int pci_fill_capabilities_generic( struct pci_device * dev ) { struct pci_device_private * const dev_priv = diff --git a/src/common_device_name.c b/src/common_device_name.c index 12f88f5..66c2104 100644 --- a/src/common_device_name.c +++ b/src/common_device_name.c @@ -46,6 +46,7 @@ #endif #include "pciaccess.h" +#include "pciaccess_private.h" #define DO_MATCH(a,b) (((a) == PCI_MATCH_ANY) || ((a) == (b))) @@ -92,7 +93,7 @@ struct pci_device_leaf { /** * Root of the PCI vendor ID search tree. */ -struct pci_id_node * tree = NULL; +_pci_hidden struct pci_id_node * tree = NULL; /** * Name of the file containing the PCI ID information. diff --git a/src/common_init.c b/src/common_init.c index 94048ea..1092faf 100644 --- a/src/common_init.c +++ b/src/common_init.c @@ -35,7 +35,7 @@ #include "pciaccess.h" #include "pciaccess_private.h" -struct pci_system * pci_sys; +_pci_hidden struct pci_system * pci_sys; /** * Initialize the PCI subsystem for access. diff --git a/src/common_map.c b/src/common_map.c index a64577b..ac1c668 100644 --- a/src/common_map.c +++ b/src/common_map.c @@ -46,7 +46,7 @@ * * \sa pci_device_unmap_range */ -int +_pci_hidden int pci_device_generic_unmap_range(struct pci_device *dev, struct pci_device_mapping *map) { diff --git a/src/freebsd_pci.c b/src/freebsd_pci.c index 0c7cf61..67ca9e3 100644 --- a/src/freebsd_pci.c +++ b/src/freebsd_pci.c @@ -439,7 +439,7 @@ static const struct pci_system_methods freebsd_pci_methods = { /** * Attempt to access the FreeBSD PCI interface. */ -int +_pci_hidden int pci_system_freebsd_create( void ) { struct pci_conf_io pciconfio; diff --git a/src/linux_devmem.c b/src/linux_devmem.c index 8650efd..a68ea11 100644 --- a/src/linux_devmem.c +++ b/src/linux_devmem.c @@ -61,7 +61,8 @@ * Before using the VGA special case code, this function should check that * VGA access are routed to the device. Right? */ -int pci_device_linux_devmem_read_rom(struct pci_device *dev, void *buffer) +_pci_hidden int +pci_device_linux_devmem_read_rom(struct pci_device *dev, void *buffer) { struct pci_device_private *priv = (struct pci_device_private *) dev; int fd; diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c index 3671f28..84cdb84 100644 --- a/src/linux_sysfs.c +++ b/src/linux_sysfs.c @@ -96,7 +96,7 @@ static int populate_entries(struct pci_system * pci_sys); /** * Attempt to access PCI subsystem using Linux's sysfs interface. */ -int +_pci_hidden int pci_system_linux_sysfs_create( void ) { int err = 0; diff --git a/src/pciaccess_private.h b/src/pciaccess_private.h index 9eb6062..c8a483e 100644 --- a/src/pciaccess_private.h +++ b/src/pciaccess_private.h @@ -29,6 +29,13 @@ * \author Ian Romanick <[EMAIL PROTECTED]> */ +#if defined(__GNUC__) && (__GNUC__ >= 4) +# define _pci_hidden __attribute__((visibility("hidden"))) +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) +# define _pci_hidden __hidden +#else /* not gcc >= 4 and not Sun Studio >= 8 */ +# define _pci_hidden +#endif /* GNUC >= 4 */ struct pci_device_mapping; commit 25de45d250811474e86cb9a09caf258aef699196 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Feb 19 14:26:54 2008 +0100 Use <byteswap.h> when using glibc, not just on linux This fixes the build on GNU/kFreeBSD. diff --git a/src/common_interface.c b/src/common_interface.c index 98f0e91..7fae277 100644 --- a/src/common_interface.c +++ b/src/common_interface.c @@ -36,7 +36,7 @@ #include "pciaccess.h" #include "pciaccess_private.h" -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) #include <byteswap.h> #if __BYTE_ORDER == __BIG_ENDIAN -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]