[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/os-support/bus Pci.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/os-support/bus

Modified Files:
      Tag: XORG-CURRENT
	Pci.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Pci.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Pci.c	23 Feb 2004 21:36:47 -0000	1.1.4.2
+++ b/Pci.c	15 Apr 2004 10:17:10 -0000	1.1.4.3
@@ -453,9 +453,9 @@
  * to the base address register to get an accurate result.  Otherwise it
  * makes a conservative guess based on the alignment of the already allocated
  * address.  If the result is accurate (ie, not an over-estimate), this is
- * indicated by setting *min to TRUE (when min is non-NULL).  This currently
- * only happens when the destructive flag is set, but in future it may be
- * possible to get the information from the OS when supported.
+ * indicated by setting *min to TRUE (when min is non-NULL).  This happens
+ * when either the destructive flag is set, the information is supplied by
+ * the OS if the OS supports this.
  */
 
 int
@@ -575,7 +575,7 @@
 pciMfDev(int busnum, int devnum)
 {
     PCITAG tag0, tag1;
-    unsigned long id0, id1, val;
+    CARD32 id0, id1, val;
 
     /* Detect a multi-function device that complies to the PCI 2.0 spec */