libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 549 insertions, 564 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
index 35e00fce7..569a4ec51 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
@@ -79,7 +79,7 @@
 /***************************************************************************/
 
 static Bool useDevMem = FALSE;
-static int  devMemFd = -1;
+static int devMemFd = -1;
 
 #ifdef HAS_APERTURE_DRV
 #define DEV_APERTURE "/dev/xf86"
@@ -95,7 +95,7 @@ static Bool cleanMTRR(void);
 #endif
 #if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
 static pointer NetBSDsetWC(int, unsigned long, unsigned long, Bool,
-			   MessageType);
+                           MessageType);
 static void NetBSDundoWC(int, pointer);
 #endif
 
@@ -106,85 +106,80 @@ static void NetBSDundoWC(int, pointer);
 static void
 checkDevMem(Bool warn)
 {
-	static Bool devMemChecked = FALSE;
-	int fd;
-	pointer base;
-
-	if (devMemChecked)
-	    return;
-	devMemChecked = TRUE;
-
-	if ((fd = open(DEV_MEM, O_RDWR)) >= 0)
-	{
-	    /* Try to map a page at the VGA address */
-	    base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-				 MAP_FLAGS, fd, (off_t)0xA0000);
-	
-	    if (base != MAP_FAILED)
-	    {
-		munmap((caddr_t)base, 4096);
-		devMemFd = fd;
-		useDevMem = TRUE;
-		return;
-	    } else {
-		/* This should not happen */
-		if (warn)
-		{
-		    xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-			    DEV_MEM, strerror(errno));
-		}
-		useDevMem = FALSE;
-		return;
-	    }
-	}
+    static Bool devMemChecked = FALSE;
+    int fd;
+    pointer base;
+
+    if (devMemChecked)
+        return;
+    devMemChecked = TRUE;
+
+    if ((fd = open(DEV_MEM, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            return;
+        }
+        else {
+            /* This should not happen */
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_MEM, strerror(errno));
+            }
+            useDevMem = FALSE;
+            return;
+        }
+    }
 #ifndef HAS_APERTURE_DRV
-	if (warn)
-	{ 
-	    xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
-		    DEV_MEM, strerror(errno));
-	} 
-	useDevMem = FALSE;
-	return;
+    if (warn) {
+        xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
+                DEV_MEM, strerror(errno));
+    }
+    useDevMem = FALSE;
+    return;
 #else
-	/* Failed to open /dev/mem, try the aperture driver */
-	if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0)
-	{
-	    /* Try to map a page at the VGA address */
-	    base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
-			     MAP_FLAGS, fd, (off_t)0xA0000);
-	
-	    if (base != MAP_FAILED)
-	    {
-		munmap((caddr_t)base, 4096);
-		devMemFd = fd;
-		useDevMem = TRUE;
-		xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
-		        DEV_APERTURE);
-		return;
-	    } else {
-
-		if (warn)
-		{
-		    xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-			    DEV_APERTURE, strerror(errno));
-		}
-	    }
-	} else {
-	    if (warn)
-	    {
+    /* Failed to open /dev/mem, try the aperture driver */
+    if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
+        /* Try to map a page at the VGA address */
+        base = mmap((caddr_t) 0, 4096, PROT_READ | PROT_WRITE,
+                    MAP_FLAGS, fd, (off_t) 0xA0000);
+
+        if (base != MAP_FAILED) {
+            munmap((caddr_t) base, 4096);
+            devMemFd = fd;
+            useDevMem = TRUE;
+            xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
+                    DEV_APERTURE);
+            return;
+        }
+        else {
+
+            if (warn) {
+                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+                        DEV_APERTURE, strerror(errno));
+            }
+        }
+    }
+    else {
+        if (warn) {
 #ifndef __OpenBSD__
-		xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-			"\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
-#else /* __OpenBSD__ */
-		xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-			"\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
-			SYSCTL_MSG);
-#endif /* __OpenBSD__ */
-	    }
-	}
-	
-	useDevMem = FALSE;
-	return;
+            xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+                    "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
+#else                           /* __OpenBSD__ */
+            xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+                    "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
+                    SYSCTL_MSG);
+#endif                          /* __OpenBSD__ */
+        }
+    }
+
+    useDevMem = FALSE;
+    return;
 
 #endif
 }
@@ -192,80 +187,72 @@ checkDevMem(Bool warn)
 void
 xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
-	checkDevMem(TRUE);
-	pVidMem->linearSupported = useDevMem;
-	pVidMem->mapMem = mapVidMem;
-	pVidMem->unmapMem = unmapVidMem;
+    checkDevMem(TRUE);
+    pVidMem->linearSupported = useDevMem;
+    pVidMem->mapMem = mapVidMem;
+    pVidMem->unmapMem = unmapVidMem;
 
-	if (useDevMem)
-		pci_system_init_dev_mem(devMemFd);
+    if (useDevMem)
+        pci_system_init_dev_mem(devMemFd);
 
 #ifdef HAS_MTRR_SUPPORT
-	if (useDevMem) {
-		if (cleanMTRR()) {
-			pVidMem->setWC = setWC;
-			pVidMem->undoWC = undoWC;
-		}
-	}
+    if (useDevMem) {
+        if (cleanMTRR()) {
+            pVidMem->setWC = setWC;
+            pVidMem->undoWC = undoWC;
+        }
+    }
 #endif
 #if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-	pVidMem->setWC = NetBSDsetWC;
-	pVidMem->undoWC = NetBSDundoWC;
+    pVidMem->setWC = NetBSDsetWC;
+    pVidMem->undoWC = NetBSDundoWC;
 #endif
-	pVidMem->initialised = TRUE;
+    pVidMem->initialised = TRUE;
 }
 
 static pointer
 mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	pointer base;
-
-	checkDevMem(FALSE);
-
-	if (useDevMem)
-	{
-	    if (devMemFd < 0) 
-	    {
-		FatalError("xf86MapVidMem: failed to open %s (%s)",
-			   DEV_MEM, strerror(errno));
-	    }
-	    base = mmap((caddr_t)0, Size,
-			(flags & VIDMEM_READONLY) ?
-			 PROT_READ : (PROT_READ | PROT_WRITE),
-			MAP_FLAGS, devMemFd, (off_t)Base);
-	    if (base == MAP_FAILED)
-	    {
-		FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)",
-			   "xf86MapVidMem", DEV_MEM, Size, Base, 
-			   strerror(errno));
-	    }
-	    return base;
-	}
-		
-	/* else, mmap /dev/vga */
-	if ((unsigned long)Base < 0xA0000 || (unsigned long)Base >= 0xC0000)
-	{
-		FatalError("%s: Address 0x%lx outside allowable range",
-			   "xf86MapVidMem", Base);
-	}
-	base = mmap(0, Size,
-		    (flags & VIDMEM_READONLY) ?
-		     PROT_READ : (PROT_READ | PROT_WRITE),
-		    MAP_FLAGS, xf86Info.consoleFd,
-		    (unsigned long)Base - 0xA0000
-	    );
-	if (base == MAP_FAILED)
-	{
-	    FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)",
-		       strerror(errno));
-	}
-	return base;
+    pointer base;
+
+    checkDevMem(FALSE);
+
+    if (useDevMem) {
+        if (devMemFd < 0) {
+            FatalError("xf86MapVidMem: failed to open %s (%s)",
+                       DEV_MEM, strerror(errno));
+        }
+        base = mmap((caddr_t) 0, Size,
+                    (flags & VIDMEM_READONLY) ?
+                    PROT_READ : (PROT_READ | PROT_WRITE),
+                    MAP_FLAGS, devMemFd, (off_t) Base);
+        if (base == MAP_FAILED) {
+            FatalError("%s: could not mmap %s [s=%lx,a=%lx] (%s)",
+                       "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno));
+        }
+        return base;
+    }
+
+    /* else, mmap /dev/vga */
+    if ((unsigned long) Base < 0xA0000 || (unsigned long) Base >= 0xC0000) {
+        FatalError("%s: Address 0x%lx outside allowable range",
+                   "xf86MapVidMem", Base);
+    }
+    base = mmap(0, Size,
+                (flags & VIDMEM_READONLY) ?
+                PROT_READ : (PROT_READ | PROT_WRITE),
+                MAP_FLAGS, xf86Info.consoleFd, (unsigned long) Base - 0xA0000);
+    if (base == MAP_FAILED) {
+        FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)",
+                   strerror(errno));
+    }
+    return base;
 }
 
 static void
 unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 {
-	munmap((caddr_t)Base, Size);
+    munmap((caddr_t) Base, Size);
 }
 
 /*
@@ -274,47 +261,46 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
 
 int
 xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
+             int Len)
 {
-	unsigned char *ptr;
-	int psize;
-	int mlen;
-
-	checkDevMem(TRUE);
-	if (devMemFd == -1) {
-	    return -1;
-	}
-
-	psize = getpagesize();
-	Offset += Base & (psize - 1);
-	Base &= ~(psize - 1);
-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
-					MAP_SHARED, devMemFd, (off_t)Base);
-	if ((long)ptr == -1)
-	{
-		xf86Msg(X_WARNING, 
-			"xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
-			DEV_MEM, Len, Base, Offset, strerror(errno));
+    unsigned char *ptr;
+    int psize;
+    int mlen;
+
+    checkDevMem(TRUE);
+    if (devMemFd == -1) {
+        return -1;
+    }
+
+    psize = getpagesize();
+    Offset += Base & (psize - 1);
+    Base &= ~(psize - 1);
+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+    ptr = (unsigned char *) mmap((caddr_t) 0, mlen, PROT_READ,
+                                 MAP_SHARED, devMemFd, (off_t) Base);
+    if ((long) ptr == -1) {
+        xf86Msg(X_WARNING,
+                "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n",
+                DEV_MEM, Len, Base, Offset, strerror(errno));
 #ifdef __OpenBSD__
-		if (Base < 0xa0000) {
-		    xf86Msg(X_WARNING, SYSCTL_MSG2);
-		} 
+        if (Base < 0xa0000) {
+            xf86Msg(X_WARNING, SYSCTL_MSG2);
+        }
 #endif
-		return -1;
-	}
+        return -1;
+    }
 #ifdef DEBUG
-	ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
-		Base, ptr[0] | (ptr[1] << 8));
+    ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
+           Base, ptr[0] | (ptr[1] << 8));
 #endif
-	(void)memcpy(Buf, (void *)(ptr + Offset), Len);
-	(void)munmap((caddr_t)ptr, mlen);
+    (void) memcpy(Buf, (void *) (ptr + Offset), Len);
+    (void) munmap((caddr_t) ptr, mlen);
 #ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
-		"-> %02x %02x %02x %02x...\n",
-		Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
+    xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS(%x, %x, Buf, %x)"
+                "-> %02x %02x %02x %02x...\n",
+                Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]);
 #endif
-	return Len;
+    return Len;
 }
 
 #ifdef USE_I386_IOPL
@@ -327,38 +313,37 @@ static Bool ExtendedEnabled = FALSE;
 Bool
 xf86EnableIO()
 {
-	if (ExtendedEnabled)
-		return TRUE;
+    if (ExtendedEnabled)
+        return TRUE;
 
-	if (i386_iopl(TRUE) < 0)
-	{
+    if (i386_iopl(TRUE) < 0) {
 #ifndef __OpenBSD__
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O",
-			   "xf86EnableIO");
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
+                "xf86EnableIO");
 #else
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O\n%s",
-			   "xf86EnableIO", SYSCTL_MSG);
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
+                "xf86EnableIO", SYSCTL_MSG);
 #endif
-		return FALSE;
-	}
-	ExtendedEnabled = TRUE;
+        return FALSE;
+    }
+    ExtendedEnabled = TRUE;
 
-	return TRUE;
+    return TRUE;
 }
-	
+
 void
 xf86DisableIO()
 {
-	if (!ExtendedEnabled)
-		return;
+    if (!ExtendedEnabled)
+        return;
 
-	i386_iopl(FALSE);
-	ExtendedEnabled = FALSE;
+    i386_iopl(FALSE);
+    ExtendedEnabled = FALSE;
 
-	return;
+    return;
 }
 
-#endif /* USE_I386_IOPL */
+#endif                          /* USE_I386_IOPL */
 
 #ifdef USE_AMD64_IOPL
 /***************************************************************************/
@@ -370,41 +355,40 @@ static Bool ExtendedEnabled = FALSE;
 Bool
 xf86EnableIO()
 {
-	if (ExtendedEnabled)
-		return TRUE;
+    if (ExtendedEnabled)
+        return TRUE;
 
-	if (amd64_iopl(TRUE) < 0)
-	{
+    if (amd64_iopl(TRUE) < 0) {
 #ifndef __OpenBSD__
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O",
-			   "xf86EnableIO");
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
+                "xf86EnableIO");
 #else
-		xf86Msg(X_WARNING,"%s: Failed to set IOPL for extended I/O\n%s",
-			   "xf86EnableIO", SYSCTL_MSG);
+        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
+                "xf86EnableIO", SYSCTL_MSG);
 #endif
-		return FALSE;
-	}
-	ExtendedEnabled = TRUE;
+        return FALSE;
+    }
+    ExtendedEnabled = TRUE;
 
-	return TRUE;
+    return TRUE;
 }
-	
+
 void
 xf86DisableIO()
 {
-	if (!ExtendedEnabled)
-		return;
-
-	if (amd64_iopl(FALSE) == 0) {
-		ExtendedEnabled = FALSE;
-	}
-	/* Otherwise, the X server has revoqued its root uid, 
-	   and thus cannot give up IO privileges any more */
-	   
-	return;
+    if (!ExtendedEnabled)
+        return;
+
+    if (amd64_iopl(FALSE) == 0) {
+        ExtendedEnabled = FALSE;
+    }
+    /* Otherwise, the X server has revoqued its root uid, 
+       and thus cannot give up IO privileges any more */
+
+    return;
 }
 
-#endif /* USE_AMD64_IOPL */
+#endif                          /* USE_AMD64_IOPL */
 
 #ifdef USE_DEV_IO
 static int IoFd = -1;
@@ -412,27 +396,26 @@ static int IoFd = -1;
 Bool
 xf86EnableIO()
 {
-	if (IoFd >= 0)
-		return TRUE;
-
-	if ((IoFd = open("/dev/io", O_RDWR)) == -1)
-	{
-		xf86Msg(X_WARNING,"xf86EnableIO: "
-				"Failed to open /dev/io for extended I/O");
-		return FALSE;
-	}
-	return TRUE;
+    if (IoFd >= 0)
+        return TRUE;
+
+    if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
+        xf86Msg(X_WARNING, "xf86EnableIO: "
+                "Failed to open /dev/io for extended I/O");
+        return FALSE;
+    }
+    return TRUE;
 }
 
 void
 xf86DisableIO()
 {
-	if (IoFd < 0)
-		return;
+    if (IoFd < 0)
+        return;
 
-	close(IoFd);
-	IoFd = -1;
-	return;
+    close(IoFd);
+    IoFd = -1;
+    return;
 }
 
 #endif
@@ -443,50 +426,46 @@ xf86DisableIO()
 /***************************************************************************/
 void
 xf86SetTVOut(int mode)
-{    
-    switch (xf86Info.consType)
-    {
+{
+    switch (xf86Info.consType) {
 #ifdef PCCONS_SUPPORT
-	case PCCONS:{
-
-	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0)
-	    {
-		xf86Msg(X_WARNING,
-		    "xf86SetTVOut: Could not set console to TV output, %s\n",
-		    strerror(errno));
-	    }
-	}
-	break;
-#endif /* PCCONS_SUPPORT */
-
-	default:
-	    FatalError("Xf86SetTVOut: Unsupported console");
-	    break; 
+    case PCCONS:{
+
+        if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
+            xf86Msg(X_WARNING,
+                    "xf86SetTVOut: Could not set console to TV output, %s\n",
+                    strerror(errno));
+        }
+    }
+        break;
+#endif                          /* PCCONS_SUPPORT */
+
+    default:
+        FatalError("Xf86SetTVOut: Unsupported console");
+        break;
     }
     return;
 }
 
 void
 xf86SetRGBOut()
-{    
-    switch (xf86Info.consType)
-    {
+{
+    switch (xf86Info.consType) {
 #ifdef PCCONS_SUPPORT
-	case PCCONS:{
-	    
-	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0)
-	    {
-		xf86Msg(X_WARNING,
-		    "xf86SetTVOut: Could not set console to RGB output, %s\n",
-		    strerror(errno));
-	    }
-	}
-	break;
-#endif /* PCCONS_SUPPORT */
-
-	default:
-	    FatalError("Xf86SetTVOut: Unsupported console");
-	    break; 
+    case PCCONS:{
+
+        if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
+            xf86Msg(X_WARNING,
+                    "xf86SetTVOut: Could not set console to RGB output, %s\n",
+                    strerror(errno));
+        }
+    }
+        break;
+#endif                          /* PCCONS_SUPPORT */
+
+    default:
+        FatalError("Xf86SetTVOut: Unsupported console");
+        break;
     }
     return;
 }
@@ -507,25 +486,25 @@ xf86SetRGBOut()
 static struct mem_range_desc *
 getAllRanges(int *nmr)
 {
-	struct mem_range_desc *mrd;
-	struct mem_range_op mro;
-
-	/*
-	 * Find how many ranges there are.  If this fails, then the kernel
-	 * probably doesn't have MTRR support.
-	 */
-	mro.mo_arg[0] = 0;
-	if (ioctl(devMemFd, MEMRANGE_GET, &mro))
-		return NULL;
-	*nmr = mro.mo_arg[0];
-	mrd = xnfalloc(*nmr * sizeof(struct mem_range_desc));
-	mro.mo_arg[0] = *nmr;
-	mro.mo_desc = mrd;
-	if (ioctl(devMemFd, MEMRANGE_GET, &mro)) {
-		free(mrd);
-		return NULL;
-	}
-	return mrd;
+    struct mem_range_desc *mrd;
+    struct mem_range_op mro;
+
+    /*
+     * Find how many ranges there are.  If this fails, then the kernel
+     * probably doesn't have MTRR support.
+     */
+    mro.mo_arg[0] = 0;
+    if (ioctl(devMemFd, MEMRANGE_GET, &mro))
+        return NULL;
+    *nmr = mro.mo_arg[0];
+    mrd = xnfalloc(*nmr * sizeof(struct mem_range_desc));
+    mro.mo_arg[0] = *nmr;
+    mro.mo_desc = mrd;
+    if (ioctl(devMemFd, MEMRANGE_GET, &mro)) {
+        free(mrd);
+        return NULL;
+    }
+    return mrd;
 }
 
 /*
@@ -537,109 +516,111 @@ getAllRanges(int *nmr)
 static Bool
 cleanMTRR()
 {
-	struct mem_range_desc *mrd;
-	struct mem_range_op mro;
-	int nmr, i;
+    struct mem_range_desc *mrd;
+    struct mem_range_op mro;
+    int nmr, i;
 
-	/* This shouldn't happen */
-	if (devMemFd < 0)
-		return FALSE;
+    /* This shouldn't happen */
+    if (devMemFd < 0)
+        return FALSE;
 
-	if (!(mrd = getAllRanges(&nmr)))
-		return FALSE;
+    if (!(mrd = getAllRanges(&nmr)))
+        return FALSE;
 
-	for (i = 0; i < nmr; i++) {
-		if (strcmp(mrd[i].mr_owner, X_MTRR_ID) == 0 &&
-		    (mrd[i].mr_flags & MDF_ACTIVE)) {
+    for (i = 0; i < nmr; i++) {
+        if (strcmp(mrd[i].mr_owner, X_MTRR_ID) == 0 &&
+            (mrd[i].mr_flags & MDF_ACTIVE)) {
 #ifdef DEBUG
-			ErrorF("Clean for (0x%lx,0x%lx)\n",
-				(unsigned long)mrd[i].mr_base,
-				(unsigned long)mrd[i].mr_len);
+            ErrorF("Clean for (0x%lx,0x%lx)\n",
+                   (unsigned long) mrd[i].mr_base,
+                   (unsigned long) mrd[i].mr_len);
 #endif
-			if (mrd[i].mr_flags & MDF_FIXACTIVE) {
-				mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-				mrd[i].mr_flags = MDF_UNCACHEABLE;
-			} else {
-				mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-			}
-			mro.mo_desc = mrd + i;
-			ioctl(devMemFd, MEMRANGE_SET, &mro);
-		}
-	}
+            if (mrd[i].mr_flags & MDF_FIXACTIVE) {
+                mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+                mrd[i].mr_flags = MDF_UNCACHEABLE;
+            }
+            else {
+                mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
+            }
+            mro.mo_desc = mrd + i;
+            ioctl(devMemFd, MEMRANGE_SET, &mro);
+        }
+    }
 #ifdef DEBUG
-	sleep(10);
+    sleep(10);
 #endif
-	free(mrd);
-	return TRUE;
+    free(mrd);
+    return TRUE;
 }
 
 typedef struct x_RangeRec {
-	struct mem_range_desc	mrd;
-	Bool			wasWC;
-	struct x_RangeRec *	next;
+    struct mem_range_desc mrd;
+    Bool wasWC;
+    struct x_RangeRec *next;
 } RangeRec, *RangePtr;
 
 static void
 freeRangeList(RangePtr range)
 {
-	RangePtr rp;
+    RangePtr rp;
 
-	while (range) {
-		rp = range;
-		range = rp->next;
-		free(rp);
-	}
+    while (range) {
+        rp = range;
+        range = rp->next;
+        free(rp);
+    }
 }
 
 static RangePtr
 dupRangeList(RangePtr list)
 {
-	RangePtr new = NULL, rp, p;
-
-	rp = list;
-	while (rp) {
-		p = xnfalloc(sizeof(RangeRec));
-		*p = *rp;
-		p->next = new;
-		new = p;
-		rp = rp->next;
-	}
-	return new;
+    RangePtr new = NULL, rp, p;
+
+    rp = list;
+    while (rp) {
+        p = xnfalloc(sizeof(RangeRec));
+        *p = *rp;
+        p->next = new;
+        new = p;
+        rp = rp->next;
+    }
+    return new;
 }
 
 static RangePtr
 sortRangeList(RangePtr list)
 {
-	RangePtr rp1, rp2, copy, sorted = NULL, minp, prev, minprev;
-	unsigned long minBase;
-
-	/* Sort by base address */
-	rp1 = copy = dupRangeList(list);
-	while (rp1) {
-		minBase = rp1->mrd.mr_base;
-		minp = rp1;
-		minprev = NULL;
-		prev = rp1;
-		rp2 = rp1->next;
-		while (rp2) {
-			if (rp2->mrd.mr_base < minBase) {
-				minBase = rp2->mrd.mr_base;
-				minp = rp2;
-				minprev = prev;
-			}
-			prev = rp2;
-			rp2 = rp2->next;
-		}
-		if (minprev) {
-			minprev->next = minp->next;
-			rp1 = copy;
-		} else {
-			rp1 = minp->next;
-		}
-		minp->next = sorted;
-		sorted = minp;
-	}
-	return sorted;
+    RangePtr rp1, rp2, copy, sorted = NULL, minp, prev, minprev;
+    unsigned long minBase;
+
+    /* Sort by base address */
+    rp1 = copy = dupRangeList(list);
+    while (rp1) {
+        minBase = rp1->mrd.mr_base;
+        minp = rp1;
+        minprev = NULL;
+        prev = rp1;
+        rp2 = rp1->next;
+        while (rp2) {
+            if (rp2->mrd.mr_base < minBase) {
+                minBase = rp2->mrd.mr_base;
+                minp = rp2;
+                minprev = prev;
+            }
+            prev = rp2;
+            rp2 = rp2->next;
+        }
+        if (minprev) {
+            minprev->next = minp->next;
+            rp1 = copy;
+        }
+        else {
+            rp1 = minp->next;
+        }
+        minp->next = sorted;
+        sorted = minp;
+    }
+    return sorted;
 }
 
 /*
@@ -647,32 +628,33 @@ sortRangeList(RangePtr list)
  */
 
 static void
-findRanges(unsigned long base, unsigned long size, RangePtr *ucp, RangePtr *wcp)
+findRanges(unsigned long base, unsigned long size, RangePtr * ucp,
+           RangePtr * wcp)
 {
-	struct mem_range_desc *mrd;
-	int nmr, i;
-	RangePtr rp, *p;
-	
-	if (!(mrd = getAllRanges(&nmr)))
-		return;
-
-	for (i = 0; i < nmr; i++) {
-		if ((mrd[i].mr_flags & MDF_ACTIVE) &&
-		    mrd[i].mr_base < base + size &&
-		    mrd[i].mr_base + mrd[i].mr_len > base) {
-			if (mrd[i].mr_flags & MDF_WRITECOMBINE)
-				p = wcp;
-			else if (mrd[i].mr_flags & MDF_UNCACHEABLE)
-				p = ucp;
-			else
-				continue;
-			rp = xnfalloc(sizeof(RangeRec));
-			rp->mrd = mrd[i];
-			rp->next = *p;
-			*p = rp;
-		}
-	}
-	free(mrd);
+    struct mem_range_desc *mrd;
+    int nmr, i;
+    RangePtr rp, *p;
+
+    if (!(mrd = getAllRanges(&nmr)))
+        return;
+
+    for (i = 0; i < nmr; i++) {
+        if ((mrd[i].mr_flags & MDF_ACTIVE) &&
+            mrd[i].mr_base < base + size &&
+            mrd[i].mr_base + mrd[i].mr_len > base) {
+            if (mrd[i].mr_flags & MDF_WRITECOMBINE)
+                p = wcp;
+            else if (mrd[i].mr_flags & MDF_UNCACHEABLE)
+                p = ucp;
+            else
+                continue;
+            rp = xnfalloc(sizeof(RangeRec));
+            rp->mrd = mrd[i];
+            rp->next = *p;
+            *p = rp;
+        }
+    }
+    free(mrd);
 }
 
 /*
@@ -683,219 +665,222 @@ findRanges(unsigned long base, unsigned long size, RangePtr *ucp, RangePtr *wcp)
 static Bool
 fullCoverage(unsigned long base, unsigned long size, RangePtr overlap)
 {
-	RangePtr rp1, sorted = NULL;
-	unsigned long end;
-
-	sorted = sortRangeList(overlap);
-	/* Look for gaps */
-	rp1 = sorted;
-	end = base + size;
-	while (rp1) {
-		if (rp1->mrd.mr_base > base) {
-			freeRangeList(sorted);
-			return FALSE;
-		} else {
-			base = rp1->mrd.mr_base + rp1->mrd.mr_len;
-		}
-		if (base >= end) {
-			freeRangeList(sorted);
-			return TRUE;
-		}
-		rp1 = rp1->next;
-	}
-	freeRangeList(sorted);
-	return FALSE;
+    RangePtr rp1, sorted = NULL;
+    unsigned long end;
+
+    sorted = sortRangeList(overlap);
+    /* Look for gaps */
+    rp1 = sorted;
+    end = base + size;
+    while (rp1) {
+        if (rp1->mrd.mr_base > base) {
+            freeRangeList(sorted);
+            return FALSE;
+        }
+        else {
+            base = rp1->mrd.mr_base + rp1->mrd.mr_len;
+        }
+        if (base >= end) {
+            freeRangeList(sorted);
+            return TRUE;
+        }
+        rp1 = rp1->next;
+    }
+    freeRangeList(sorted);
+    return FALSE;
 }
 
 static pointer
 addWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
 {
-	RangePtr uc = NULL, wc = NULL, retlist = NULL;
-	struct mem_range_desc mrd;
-	struct mem_range_op mro;
-
-	findRanges(base, size, &uc, &wc);
-
-	/* See of the full range is already WC */
-	if (!uc && fullCoverage(base, size, wc)) {
-		xf86DrvMsg(screenNum, from, 
-		   "Write-combining range (0x%lx,0x%lx) was already set\n",
-		    base, size);
-		return NULL;
-	}
-
-	/* Otherwise, try to add the new range */
-	mrd.mr_base = base;
-	mrd.mr_len = size;
-	strcpy(mrd.mr_owner, X_MTRR_ID);
-	mrd.mr_flags = MDF_WRITECOMBINE;
-	mro.mo_desc = &mrd;
-	mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-	if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-		xf86DrvMsg(screenNum, X_WARNING,
-			   "Failed to set write-combining range "
-			   "(0x%lx,0x%lx)\n", base, size);
-		return NULL;
-	} else {
-		xf86DrvMsg(screenNum, from,
-			   "Write-combining range (0x%lx,0x%lx)\n", base, size);
-		retlist = xnfalloc(sizeof(RangeRec));
-		retlist->mrd = mrd;
-		retlist->wasWC = FALSE;
-		retlist->next = NULL;
-		return retlist;
-	}
+    RangePtr uc = NULL, wc = NULL, retlist = NULL;
+    struct mem_range_desc mrd;
+    struct mem_range_op mro;
+
+    findRanges(base, size, &uc, &wc);
+
+    /* See of the full range is already WC */
+    if (!uc && fullCoverage(base, size, wc)) {
+        xf86DrvMsg(screenNum, from,
+                   "Write-combining range (0x%lx,0x%lx) was already set\n",
+                   base, size);
+        return NULL;
+    }
+
+    /* Otherwise, try to add the new range */
+    mrd.mr_base = base;
+    mrd.mr_len = size;
+    strcpy(mrd.mr_owner, X_MTRR_ID);
+    mrd.mr_flags = MDF_WRITECOMBINE;
+    mro.mo_desc = &mrd;
+    mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+    if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
+        xf86DrvMsg(screenNum, X_WARNING,
+                   "Failed to set write-combining range "
+                   "(0x%lx,0x%lx)\n", base, size);
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(screenNum, from,
+                   "Write-combining range (0x%lx,0x%lx)\n", base, size);
+        retlist = xnfalloc(sizeof(RangeRec));
+        retlist->mrd = mrd;
+        retlist->wasWC = FALSE;
+        retlist->next = NULL;
+        return retlist;
+    }
 }
 
 static pointer
 delWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
 {
-	RangePtr uc = NULL, wc = NULL, retlist = NULL;
-	struct mem_range_desc mrd;
-	struct mem_range_op mro;
-
-	findRanges(base, size, &uc, &wc);
-
-	/*
-	 * See of the full range is already not WC, or if there is full
-	 * coverage from UC ranges.
-	 */
-	if (!wc || fullCoverage(base, size, uc)) {
-		xf86DrvMsg(screenNum, from, 
-		   "Write-combining range (0x%lx,0x%lx) was already clear\n",
-		    base, size);
-		return NULL;
-	}
-
-	/* Otherwise, try to add the new range */
-	mrd.mr_base = base;
-	mrd.mr_len = size;
-	strcpy(mrd.mr_owner, X_MTRR_ID);
-	mrd.mr_flags = MDF_UNCACHEABLE;
-	mro.mo_desc = &mrd;
-	mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-	if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-		xf86DrvMsg(screenNum, X_WARNING,
-			   "Failed to remove write-combining range "
-			   "(0x%lx,0x%lx)\n", base, size);
-		/* XXX Should then remove all of the overlapping WC ranges */
-		return NULL;
-	} else {
-		xf86DrvMsg(screenNum, from,
-			   "Removed Write-combining range (0x%lx,0x%lx)\n",
-			   base, size);
-		retlist = xnfalloc(sizeof(RangeRec));
-		retlist->mrd = mrd;
-		retlist->wasWC = TRUE;
-		retlist->next = NULL;
-		return retlist;
-	}
+    RangePtr uc = NULL, wc = NULL, retlist = NULL;
+    struct mem_range_desc mrd;
+    struct mem_range_op mro;
+
+    findRanges(base, size, &uc, &wc);
+
+    /*
+     * See of the full range is already not WC, or if there is full
+     * coverage from UC ranges.
+     */
+    if (!wc || fullCoverage(base, size, uc)) {
+        xf86DrvMsg(screenNum, from,
+                   "Write-combining range (0x%lx,0x%lx) was already clear\n",
+                   base, size);
+        return NULL;
+    }
+
+    /* Otherwise, try to add the new range */
+    mrd.mr_base = base;
+    mrd.mr_len = size;
+    strcpy(mrd.mr_owner, X_MTRR_ID);
+    mrd.mr_flags = MDF_UNCACHEABLE;
+    mro.mo_desc = &mrd;
+    mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+    if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
+        xf86DrvMsg(screenNum, X_WARNING,
+                   "Failed to remove write-combining range "
+                   "(0x%lx,0x%lx)\n", base, size);
+        /* XXX Should then remove all of the overlapping WC ranges */
+        return NULL;
+    }
+    else {
+        xf86DrvMsg(screenNum, from,
+                   "Removed Write-combining range (0x%lx,0x%lx)\n", base, size);
+        retlist = xnfalloc(sizeof(RangeRec));
+        retlist->mrd = mrd;
+        retlist->wasWC = TRUE;
+        retlist->next = NULL;
+        return retlist;
+    }
 }
 
 static pointer
 setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
-	MessageType from)
+      MessageType from)
 {
-	if (enable)
-		return addWC(screenNum, base, size, from);
-	else
-		return delWC(screenNum, base, size, from);
+    if (enable)
+        return addWC(screenNum, base, size, from);
+    else
+        return delWC(screenNum, base, size, from);
 }
 
 static void
 undoWC(int screenNum, pointer list)
 {
-	RangePtr rp;
-	struct mem_range_op mro;
-	Bool failed;
+    RangePtr rp;
+    struct mem_range_op mro;
+    Bool failed;
 
-	rp = list;
-	while (rp) {
+    rp = list;
+    while (rp) {
 #ifdef DEBUG
-		ErrorF("Undo for (0x%lx,0x%lx), %d\n",
-			(unsigned long)rp->mrd.mr_base,
-			(unsigned long)rp->mrd.mr_len, rp->wasWC);
+        ErrorF("Undo for (0x%lx,0x%lx), %d\n",
+               (unsigned long) rp->mrd.mr_base,
+               (unsigned long) rp->mrd.mr_len, rp->wasWC);
 #endif
-		failed = FALSE;
-		if (rp->wasWC) {
-			mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-			rp->mrd.mr_flags = MDF_WRITECOMBINE;
-			strcpy(rp->mrd.mr_owner, "unknown");
-		} else {
-			mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
-		}
-		mro.mo_desc = &rp->mrd;
-
-		if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
-			if (!rp->wasWC) {
-				mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
-				rp->mrd.mr_flags = MDF_UNCACHEABLE;
-				strcpy(rp->mrd.mr_owner, "unknown");
-				if (ioctl(devMemFd, MEMRANGE_SET, &mro))
-					failed = TRUE;
-			} else
-				failed = TRUE;
-		}
-		if (failed) {
-			xf86DrvMsg(screenNum, X_WARNING,
-				"Failed to restore MTRR range (0x%lx,0x%lx)\n",
-				(unsigned long)rp->mrd.mr_base,
-				(unsigned long)rp->mrd.mr_len);
-		}
-		rp = rp->next;
-	}
+        failed = FALSE;
+        if (rp->wasWC) {
+            mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+            rp->mrd.mr_flags = MDF_WRITECOMBINE;
+            strcpy(rp->mrd.mr_owner, "unknown");
+        }
+        else {
+            mro.mo_arg[0] = MEMRANGE_SET_REMOVE;
+        }
+        mro.mo_desc = &rp->mrd;
+
+        if (ioctl(devMemFd, MEMRANGE_SET, &mro)) {
+            if (!rp->wasWC) {
+                mro.mo_arg[0] = MEMRANGE_SET_UPDATE;
+                rp->mrd.mr_flags = MDF_UNCACHEABLE;
+                strcpy(rp->mrd.mr_owner, "unknown");
+                if (ioctl(devMemFd, MEMRANGE_SET, &mro))
+                    failed = TRUE;
+            }
+            else
+                failed = TRUE;
+        }
+        if (failed) {
+            xf86DrvMsg(screenNum, X_WARNING,
+                       "Failed to restore MTRR range (0x%lx,0x%lx)\n",
+                       (unsigned long) rp->mrd.mr_base,
+                       (unsigned long) rp->mrd.mr_len);
+        }
+        rp = rp->next;
+    }
 }
 
-#endif /* HAS_MTRR_SUPPORT */
-
+#endif                          /* HAS_MTRR_SUPPORT */
 
 #if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
 static pointer
 NetBSDsetWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
-	    MessageType from)
+            MessageType from)
 {
-	struct mtrr *mtrrp;
-	int n;
-
-	xf86DrvMsg(screenNum, X_WARNING,
-		   "%s MTRR %lx - %lx\n", enable ? "set" : "remove",
-		   base, (base + size));
-
-	mtrrp = xnfalloc(sizeof (struct mtrr));
-	mtrrp->base = base;
-	mtrrp->len = size;
-	mtrrp->type = MTRR_TYPE_WC;
-
-	/*
-	 * MTRR_PRIVATE will make this MTRR get reset automatically
-	 * if this process exits, so we have no need for an explicit
-	 * cleanup operation when starting a new server.
-	 */
-
-	if (enable)
-		mtrrp->flags = MTRR_VALID | MTRR_PRIVATE;
-	else
-		mtrrp->flags = 0;
-	n = 1;
-
-	if (i386_set_mtrr(mtrrp, &n) < 0) {
-		free(mtrrp);
-		return NULL;
-	}
-	return mtrrp;
+    struct mtrr *mtrrp;
+    int n;
+
+    xf86DrvMsg(screenNum, X_WARNING,
+               "%s MTRR %lx - %lx\n", enable ? "set" : "remove",
+               base, (base + size));
+
+    mtrrp = xnfalloc(sizeof(struct mtrr));
+    mtrrp->base = base;
+    mtrrp->len = size;
+    mtrrp->type = MTRR_TYPE_WC;
+
+    /*
+     * MTRR_PRIVATE will make this MTRR get reset automatically
+     * if this process exits, so we have no need for an explicit
+     * cleanup operation when starting a new server.
+     */
+
+    if (enable)
+        mtrrp->flags = MTRR_VALID | MTRR_PRIVATE;
+    else
+        mtrrp->flags = 0;
+    n = 1;
+
+    if (i386_set_mtrr(mtrrp, &n) < 0) {
+        free(mtrrp);
+        return NULL;
+    }
+    return mtrrp;
 }
 
 static void
 NetBSDundoWC(int screenNum, pointer list)
 {
-	struct mtrr *mtrrp = (struct mtrr *)list;
-	int n;
-
-	if (mtrrp == NULL)
-		return;
-	n = 1;
-	mtrrp->flags &= ~MTRR_VALID;
-	i386_set_mtrr(mtrrp, &n);
-	free(mtrrp);
+    struct mtrr *mtrrp = (struct mtrr *) list;
+    int n;
+
+    if (mtrrp == NULL)
+        return;
+    n = 1;
+    mtrrp->flags &= ~MTRR_VALID;
+    i386_set_mtrr(mtrrp, &n);
+    free(mtrrp);
 }
 #endif