diff options
| author | tsi <tsi> | 2008-07-01 18:16:41 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-07-01 18:16:41 +0000 |
| commit | ef7e0d116d4713532f62eb648b2719884b086071 (patch) | |
| tree | c095ed54116cb3b8ded2c079eaaaf94d66095785 | |
| parent | c6c0209b240172b6f01278cf4913735b365ba3d0 (diff) | |
56. Allow 32-bit PCI I/O addresses on Linux/PowerPC (Marc La France).
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 3 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 1884318e9..de0a7314c 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,5 @@ XFree86 4.7.99.21 (xx July 2008) + 56. Allow 32-bit PCI I/O addresses on Linux/PowerPC (Marc La France). 55. A less kludgy implementation of the Simba hack introduced in CHANGELOG #39 (Marc La France). @@ -20770,4 +20771,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3969 2008/06/23 11:03:04 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3970 2008/06/23 14:42:19 tsi Exp $ diff --git a/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c b/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c index 7f0f2528a..4d29d7470 100644 --- a/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c +++ b/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.20tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.21tsi Exp $ */ /* Resource information code */ @@ -204,9 +204,9 @@ xf86BusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#if defined(__sparc__) || defined(__powerpc__) +#if defined(__sparc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -#elif defined(__mips__) +#elif defined(__mips__) || defined(__powerpc__) RANGE(range, 0x00000000, 0xffffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -224,9 +224,9 @@ xf86PciBusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#if defined(__sparc__) || defined(__powerpc__) +#if defined(__sparc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -#elif defined(__mips__) +#elif defined(__mips__) || defined(__powerpc__) RANGE(range, 0x00000000, 0xffffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -246,9 +246,9 @@ xf86IsaBusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#if defined(__sparc__) || defined(__powerpc__) +#if defined(__sparc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -#elif defined(__mips__) +#elif defined(__mips__) || defined(__powerpc__) RANGE(range, 0x00000000, 0xffffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -274,9 +274,9 @@ xf86AccResFromOS(resPtr ret) ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); ret = xf86AddResToList(ret, &range, -1); -#if defined(__sparc__) || defined(__powerpc__) +#if defined(__sparc__) RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock); -#elif defined(__mips__) +#elif defined(__mips__) || defined(__powerpc__) RANGE(range, 0xffffffff, 0xffffffff, ResExcIoBlock); #else RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock); |