libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 43 insertions, 44 deletions

diff --git a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
index 0021b5544..254748ff6 100644
--- a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
   for Alpha Linux
 *******************************************************************************/
- 
+
 /* 
  *   Create a dependency that should be immune from the effect of register
  *   renaming as is commonly seen in superscalar processors.  This should
@@ -10,7 +10,7 @@
  *   
  *   Slowbcopy(char *src, char *dst, int count)   
  *   
- */ 
+ */
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
@@ -27,16 +27,16 @@ static int really_slow_bcopy;
 void
 xf86SetReallySlowBcopy(void)
 {
-	really_slow_bcopy = 1;
+    really_slow_bcopy = 1;
 }
 
 #if defined(__i386__) || defined(__amd64__)
-static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
+static void
+xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int len)
 {
-    while(len--)
-    {
-	*dst++ = *src++;
-	outb(0x80, 0x00);
+    while (len--) {
+        *dst++ = *src++;
+        outb(0x80, 0x00);
     }
 }
 #endif
@@ -47,12 +47,12 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
 {
 #if defined(__i386__) || defined(__amd64__)
     if (really_slow_bcopy) {
-	xf86_really_slow_bcopy(src, dst, len);
-	return;
+        xf86_really_slow_bcopy(src, dst, len);
+        return;
     }
 #endif
-    while(len--)
-	*dst++ = *src++;
+    while (len--)
+        *dst++ = *src++;
 }
 
 #ifdef __alpha__
@@ -76,42 +76,41 @@ unsigned long _bus_base(void);
 void
 xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count)
 {
-	if (useSparse())
-	{
-		unsigned long addr;
-		long result;
-
-		addr = (unsigned long) src;
-		while (count) {
-			result = *(volatile int *) addr;
-			result >>= ((addr>>SPARSE) & 3) * 8;
-			*dst++ = (unsigned char) (0xffUL & result);
-			addr += 1<<SPARSE;
-			count--;
-			outb(0x80, 0x00);
-		}
-	}
-	else
-		xf86SlowBcopy(src, dst, count);
+    if (useSparse()) {
+        unsigned long addr;
+        long result;
+
+        addr = (unsigned long) src;
+        while (count) {
+            result = *(volatile int *) addr;
+            result >>= ((addr >> SPARSE) & 3) * 8;
+            *dst++ = (unsigned char) (0xffUL & result);
+            addr += 1 << SPARSE;
+            count--;
+            outb(0x80, 0x00);
+        }
+    }
+    else
+        xf86SlowBcopy(src, dst, count);
 }
 
 void
 xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count)
 {
-	if (useSparse())
-	{
-		unsigned long addr;
-
-		addr = (unsigned long) dst;
-		while (count) {
-			*(volatile unsigned int *) addr = (unsigned short)(*src) * 0x01010101;
-			src++;
-			addr += 1<<SPARSE;
-			count--;
-			outb(0x80, 0x00);
-		}
-	}
-	else
-		xf86SlowBcopy(src, dst, count);
+    if (useSparse()) {
+        unsigned long addr;
+
+        addr = (unsigned long) dst;
+        while (count) {
+            *(volatile unsigned int *) addr =
+                (unsigned short) (*src) * 0x01010101;
+            src++;
+            addr += 1 << SPARSE;
+            count--;
+            outb(0x80, 0x00);
+        }
+    }
+    else
+        xf86SlowBcopy(src, dst, count);
 }
 #endif