Module Name: xsrc
Committed By: macallan
Date: Sat Aug 27 03:52:00 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
ppc_video.c
Log Message:
use PCI_MAGIC_IO_RANGE instead of hardcoding the wrong ( for shark ) offset
now things actually have a chance of working
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.8 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c:1.8 Thu Aug 11 00:04:31 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/ppc_video.c Sat Aug 27 03:52:00 2016
@@ -27,6 +27,7 @@
#include <xorg-config.h>
#endif
+#include <errno.h>
#include <X11/X.h>
#include <machine/param.h>
#include "xf86.h"
@@ -71,10 +72,10 @@ xf86EnableIO()
xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
if (ioBase == MAP_FAILED) {
ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
- 0xf2000000);
+ PCI_MAGIC_IO_RANGE);
xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
if (ioBase == MAP_FAILED) {
- xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
+ xf86MsgVerb(X_WARNING, 3, "Can't map IO space! (%d)\n", errno);
return FALSE;
}
}
