diff options
author | Phil Sutter <phil@nwl.cc> | 2010-06-06 03:06:42 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-08 16:28:45 +0200 |
commit | 5c63c813453afd57a824fb056fc92fa21ed35c91 (patch) | |
tree | 90442253de25f1b9ea801d766255ba0d07eca702 /package/xorg-server/patches/patch-hw_xfree86_common_compiler_h | |
parent | 674fab1857ba3f01f729a853a11e16f10c662b8c (diff) |
xorg-server: fix memory mapped IO for lemote
Apparently this is an update to the original fix, code taken from
http://www.gentoo-cn.org/gitweb/?p=loongson.git;a=blob_plain;f=x11-base/xorg-server/files/xorg-server-9999-loongson.patch;hb=2e5b51e34b7a7d0fe92ea9762d1aed9ac0b808c9
Diffstat (limited to 'package/xorg-server/patches/patch-hw_xfree86_common_compiler_h')
-rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_common_compiler_h | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h new file mode 100644 index 000000000..44b9b9b1a --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h @@ -0,0 +1,55 @@ + Caller side code changes regarding memory mapped IO. This patch applies + for mips architectures and is used by xf86-video-siliconmotion. +--- xorg-server-1.7.6.orig/hw/xfree86/common/compiler.h 2010-03-12 05:38:22.000000000 +0100 ++++ xorg-server-1.7.6/hw/xfree86/common/compiler.h 2010-06-05 09:43:12.531809482 +0200 +@@ -713,42 +713,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b + # define PORT_SIZE short + # endif + +-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ ++_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ ++ + + static __inline__ void + outb(unsigned PORT_SIZE port, unsigned char val) + { +- *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; ++ *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase) = val; + } + + static __inline__ void + outw(unsigned PORT_SIZE port, unsigned short val) + { +- *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; ++ *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase) = val; + } + + static __inline__ void + outl(unsigned PORT_SIZE port, unsigned int val) + { +- *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; ++ *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase) = val; + } + + static __inline__ unsigned int + inb(unsigned PORT_SIZE port) + { +- return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase); ++ return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase); + } + + static __inline__ unsigned int + inw(unsigned PORT_SIZE port) + { +- return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase); ++ return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase); + } + + static __inline__ unsigned int + inl(unsigned PORT_SIZE port) + { +- return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase); ++ return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase); + } + + |