Attachment 2902 Details for Bug 2373 – Re-attach 3082.

[patch] Re-attach 3082.

lnx_pci_xf86GetOSOffsetFromPCI_return.diff (text/plain), 1.51 KB, created by Luc Verhaegen on 2005-08-16 21:26:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luc Verhaegen

Created: 2005-08-16 21:26:58 UTC

Size: 1.51 KB

patch

obsolete

>Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v
>retrieving revision 1.7
>diff -u -r1.7 lnx_pci.c
>--- programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c	3 Jul 2005 08:53:46 -0000	1.7
>+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c	17 Aug 2005 04:16:25 -0000
>@@ -164,7 +164,7 @@
>     unsigned int ndx;
> 
>     if (!(file = fopen("/proc/bus/pci/devices","r")))
>-        return NULL;
>+        return 0;
>     do {
>         res = fgets(c,0x1ff,file);
>         if (res) {
>@@ -192,7 +192,7 @@
> 		         &size[3], &size[4], &size[5], &size[6]);
>             if (num != 16) {  /* apparantly not 2.3 style */
>                 fclose(file);
>-                return NULL;
>+                return 0;
>             }
> 
>             dev = devfn >> 3;
>@@ -211,10 +211,11 @@
> 		    else /* this the ROM bar */
> 			savePtr = (0xFFFFFFF0) & 
> 			    pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
>+
>                     /* find the index of the incoming base */
>                     if (base >= savePtr && base <= (savePtr + size[ndx])) {
>                         fclose(file);
>-                        return ( ~(0xFUL) & (offset[ndx] + (base - savePtr)));
>+                        return (offset[ndx] & ~(0xFUL)) + (base - savePtr);
>                     }
>                 }
>             }
>@@ -222,6 +223,6 @@
>     } while (res);
> 
>     fclose(file);
>-    return NULL;
>+    return 0;
> 
> }

Actions: View | Splinter Review

Attachments on bug 2373: 1748 | 2425 | 2432 | 2461 | 2464 | 2478 | 2480 | 2483 | 2498 | 2508 | 2645 | 2673 | 2902 | 4983

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.