summaryrefslogtreecommitdiff
path: root/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
diff options
context:
space:
mode:
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_h51
1 files changed, 27 insertions, 24 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
index ebf414b0d..8a5f29ebd 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
@@ -1,55 +1,58 @@
- Caller side code changes regarding memory mapped IO. This patch applies
- for mips architectures and is used by xf86-video-siliconmotion.
---- xorg-server-1.9.3.orig/hw/xfree86/common/compiler.h 2010-09-30 09:27:11.000000000 +0200
-+++ xorg-server-1.9.3/hw/xfree86/common/compiler.h 2012-10-01 13:23:55.000000000 +0200
-@@ -714,42 +714,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b
- # define PORT_SIZE short
- # endif
-
--_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
+--- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h 2012-05-17 19:09:03.000000000 +0200
++++ xorg-server-1.12.2/hw/xfree86/common/compiler.h 2013-04-30 10:52:21.000000000 +0200
+@@ -710,26 +710,26 @@ 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;
+- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++ *(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;
+- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++ *(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;
+- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+ val;
}
- static __inline__ unsigned int
+@@ -737,21 +737,21 @@ 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);
+ return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
+- IOPortBase);
++ 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);
+ return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
+- IOPortBase);
++ 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);
+ return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
+- IOPortBase);
++ ioBase);
}
-
+ #if defined(__mips__)