libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

3 files changed, 339 insertions, 305 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bus/Sbus.c b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
index c02d2cd55..b75308aa1 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Sbus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
@@ -47,6 +47,7 @@ static int promFd = -1;
 static int promCurrentNode;
 static int promOpenCount = 0;
 static int promP1275 = -1;
+
 #define MAX_PROP	128
 #define MAX_VAL		(4096-128-4)
 static struct openpromio *promOpio;
@@ -54,21 +55,23 @@ static struct openpromio *promOpio;
 sbusDevicePtr *xf86SbusInfo = NULL;
 
 struct sbus_devtable sbusDeviceTable[] = {
-    { SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "sunbw2", "Sun Monochrome (bwtwo)" },
-    { SBUS_DEVICE_CG2, FBTYPE_SUN2COLOR, "cgtwo", NULL, "Sun Color2 (cgtwo)" },
-    { SBUS_DEVICE_CG3, FBTYPE_SUN3COLOR, "cgthree", "suncg3", "Sun Color3 (cgthree)" },
-    { SBUS_DEVICE_CG4, FBTYPE_SUN4COLOR, "cgfour", NULL, "Sun Color4 (cgfour)" },
-    { SBUS_DEVICE_CG6, FBTYPE_SUNFAST_COLOR, "cgsix", "suncg6", "Sun GX" },
-    { SBUS_DEVICE_CG8, FBTYPE_MEMCOLOR, "cgeight", NULL, "Sun CG8/RasterOps" },
-    { SBUS_DEVICE_CG12, FBTYPE_SUNGP3, "cgtwelve", NULL, "Sun GS (cgtwelve)" },
-    { SBUS_DEVICE_CG14, FBTYPE_MDICOLOR, "cgfourteen", "suncg14", "Sun SX" },
-    { SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower" },
-    { SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus" },
-    { SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX" },
-    { SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX" },
-    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },
-    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },
-    { 0, 0, NULL }
+    {SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "sunbw2",
+     "Sun Monochrome (bwtwo)"},
+    {SBUS_DEVICE_CG2, FBTYPE_SUN2COLOR, "cgtwo", NULL, "Sun Color2 (cgtwo)"},
+    {SBUS_DEVICE_CG3, FBTYPE_SUN3COLOR, "cgthree", "suncg3",
+     "Sun Color3 (cgthree)"},
+    {SBUS_DEVICE_CG4, FBTYPE_SUN4COLOR, "cgfour", NULL, "Sun Color4 (cgfour)"},
+    {SBUS_DEVICE_CG6, FBTYPE_SUNFAST_COLOR, "cgsix", "suncg6", "Sun GX"},
+    {SBUS_DEVICE_CG8, FBTYPE_MEMCOLOR, "cgeight", NULL, "Sun CG8/RasterOps"},
+    {SBUS_DEVICE_CG12, FBTYPE_SUNGP3, "cgtwelve", NULL, "Sun GS (cgtwelve)"},
+    {SBUS_DEVICE_CG14, FBTYPE_MDICOLOR, "cgfourteen", "suncg14", "Sun SX"},
+    {SBUS_DEVICE_GT, FBTYPE_SUNGT, "gt", NULL, "Sun Graphics Tower"},
+    {SBUS_DEVICE_MGX, -1, "mgx", NULL, "Quantum 3D MGXplus"},
+    {SBUS_DEVICE_LEO, FBTYPE_SUNLEO, "leo", "sunleo", "Sun ZX or Turbo ZX"},
+    {SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX"},
+    {SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB"},
+    {SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D"},
+    {0, 0, NULL}
 };
 
 int
@@ -76,12 +79,13 @@ promGetSibling(int node)
 {
     promOpio->oprom_size = sizeof(int);
 
-    if (node == -1) return 0;
-    *(int *)promOpio->oprom_array = node;
+    if (node == -1)
+        return 0;
+    *(int *) promOpio->oprom_array = node;
     if (ioctl(promFd, OPROMNEXT, promOpio) < 0)
-	return 0;
-    promCurrentNode = *(int *)promOpio->oprom_array;
-    return *(int *)promOpio->oprom_array;
+        return 0;
+    promCurrentNode = *(int *) promOpio->oprom_array;
+    return *(int *) promOpio->oprom_array;
 }
 
 int
@@ -89,12 +93,13 @@ promGetChild(int node)
 {
     promOpio->oprom_size = sizeof(int);
 
-    if (!node || node == -1) return 0;
-    *(int *)promOpio->oprom_array = node;
+    if (!node || node == -1)
+        return 0;
+    *(int *) promOpio->oprom_array = node;
     if (ioctl(promFd, OPROMCHILD, promOpio) < 0)
-	return 0;
-    promCurrentNode = *(int *)promOpio->oprom_array;
-    return *(int *)promOpio->oprom_array;
+        return 0;
+    promCurrentNode = *(int *) promOpio->oprom_array;
+    return *(int *) promOpio->oprom_array;
 }
 
 char *
@@ -104,8 +109,9 @@ promGetProperty(const char *prop, int *lenp)
 
     strcpy(promOpio->oprom_array, prop);
     if (ioctl(promFd, OPROMGETPROP, promOpio) < 0)
-	return 0;
-    if (lenp) *lenp = promOpio->oprom_size;
+        return 0;
+    if (lenp)
+        *lenp = promOpio->oprom_size;
     return promOpio->oprom_array;
 }
 
@@ -114,15 +120,15 @@ promGetBool(const char *prop)
 {
     promOpio->oprom_size = 0;
 
-    *(int *)promOpio->oprom_array = 0;
+    *(int *) promOpio->oprom_array = 0;
     for (;;) {
-	promOpio->oprom_size = MAX_PROP;
-	if (ioctl(promFd, OPROMNXTPROP, promOpio) < 0)
-	    return 0;
-	if (!promOpio->oprom_size)
-	    return 0;
-	if (!strcmp(promOpio->oprom_array, prop))
-	    return 1;
+        promOpio->oprom_size = MAX_PROP;
+        if (ioctl(promFd, OPROMNXTPROP, promOpio) < 0)
+            return 0;
+        if (!promOpio->oprom_size)
+            return 0;
+        if (!strcmp(promOpio->oprom_array, prop))
+            return 1;
     }
 }
 
@@ -138,13 +144,13 @@ promSetNode(sbusPromNodePtr pnode)
     int node;
 
     if (!pnode->node || pnode->node == -1)
-	return -1;
+        return -1;
     if (pnode->cookie[0] & PROM_NODE_SIBLING)
-	node = promGetSibling(pnode->cookie[1]);
+        node = promGetSibling(pnode->cookie[1]);
     else
-	node = promGetChild(pnode->cookie[1]);
+        node = promGetChild(pnode->cookie[1]);
     if (pnode->node != node)
-	return -1;
+        return -1;
     return 0;
 }
 
@@ -156,23 +162,24 @@ promIsP1275(void)
     char buffer[1024];
 
     if (promP1275 != -1)
-	return;
+        return;
     promP1275 = 0;
-    f = fopen("/proc/cpuinfo","r");
-    if (!f) return;
+    f = fopen("/proc/cpuinfo", "r");
+    if (!f)
+        return;
     while (fgets(buffer, 1024, f) != NULL)
-	if (!strncmp (buffer, "type", 4) && strstr (buffer, "sun4u")) {
-	    promP1275 = 1;
-	    break;
-	}
+        if (!strncmp(buffer, "type", 4) && strstr(buffer, "sun4u")) {
+            promP1275 = 1;
+            break;
+        }
     fclose(f);
 #elif defined(sun)
     struct utsname buffer;
 
     if ((uname(&buffer) >= 0) && !strcmp(buffer.machine, "sun4u"))
-	promP1275 = TRUE;
+        promP1275 = TRUE;
     else
-	promP1275 = FALSE;
+        promP1275 = FALSE;
 #elif defined(__FreeBSD__)
     promP1275 = TRUE;
 #else
@@ -184,12 +191,12 @@ void
 sparcPromClose(void)
 {
     if (promOpenCount > 1) {
-	promOpenCount--;
-	return;
+        promOpenCount--;
+        return;
     }
     if (promFd != -1) {
-	close(promFd);
-	promFd = -1;
+        close(promFd);
+        promFd = -1;
     }
     free(promOpio);
     promOpio = NULL;
@@ -200,21 +207,21 @@ int
 sparcPromInit(void)
 {
     if (promOpenCount) {
-	promOpenCount++;
-	return 0;
+        promOpenCount++;
+        return 0;
     }
     promFd = open("/dev/openprom", O_RDONLY, 0);
     if (promFd == -1)
-	return -1;
-    promOpio = (struct openpromio *)malloc(4096);
+        return -1;
+    promOpio = (struct openpromio *) malloc(4096);
     if (!promOpio) {
-	sparcPromClose();
-	return -1;
+        sparcPromClose();
+        return -1;
     }
     promRootNode = promGetSibling(0);
     if (!promRootNode) {
-	sparcPromClose();
-	return -1;
+        sparcPromClose();
+        return -1;
     }
     promIsP1275();
     promOpenCount++;
@@ -226,7 +233,7 @@ char *
 sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp)
 {
     if (promSetNode(pnode))
-	return NULL;
+        return NULL;
     return promGetProperty(prop, lenp);
 }
 
@@ -234,7 +241,7 @@ int
 sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
 {
     if (promSetNode(pnode))
-	return 0;
+        return 0;
     return promGetBool(prop);
 }
 
@@ -247,35 +254,37 @@ promWalkGetDriverName(int node, int oldnode)
     int devId, i;
 
     prop = promGetProperty("device_type", &len);
-    if (prop && (len > 0)) do {
-	if (!strcmp(prop, "display")) {
-	    prop = promGetProperty("name", &len);
-	    if (!prop || len <= 0)
-		break;
-	    while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
-		prop++;
-	    for (i = 0; sbusDeviceTable[i].devId; i++)
-		if (!strcmp(prop, sbusDeviceTable[i].promName))
-		    break;
-	    devId = sbusDeviceTable[i].devId;
-	    if (!devId)
-		break;
-	    if (sbusDeviceTable[i].driverName)
-	    	return sbusDeviceTable[i].driverName;
-	}
-    } while (0);
+    if (prop && (len > 0))
+        do {
+            if (!strcmp(prop, "display")) {
+                prop = promGetProperty("name", &len);
+                if (!prop || len <= 0)
+                    break;
+                while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
+                    prop++;
+                for (i = 0; sbusDeviceTable[i].devId; i++)
+                    if (!strcmp(prop, sbusDeviceTable[i].promName))
+                        break;
+                devId = sbusDeviceTable[i].devId;
+                if (!devId)
+                    break;
+                if (sbusDeviceTable[i].driverName)
+                    return sbusDeviceTable[i].driverName;
+            }
+        } while (0);
 
     nextnode = promGetChild(node);
     if (nextnode) {
-	char *name;
-	name = promWalkGetDriverName(nextnode, node);
-	if (name)
-	    return name;
+        char *name;
+
+        name = promWalkGetDriverName(nextnode, node);
+        if (name)
+            return name;
     }
 
     nextnode = promGetSibling(node);
     if (nextnode)
-	return promWalkGetDriverName(nextnode, node);
+        return promWalkGetDriverName(nextnode, node);
     return NULL;
 }
 
@@ -285,7 +294,7 @@ sparcDriverName(void)
     char *name;
 
     if (sparcPromInit() < 0)
-	    return NULL;
+        return NULL;
     promGetSibling(0);
     name = promWalkGetDriverName(promRootNode, 0);
     sparcPromClose();
@@ -293,7 +302,8 @@ sparcDriverName(void)
 }
 
 static void
-promWalkAssignNodes(int node, int oldnode, int flags, sbusDevicePtr *devicePtrs)
+promWalkAssignNodes(int node, int oldnode, int flags,
+                    sbusDevicePtr * devicePtrs)
 {
     int nextnode;
     int len, sbus = flags & PROM_NODE_SBUS;
@@ -302,67 +312,72 @@ promWalkAssignNodes(int node, int oldnode, int flags, sbusDevicePtr *devicePtrs)
     sbusPromNode pNode, pNode2;
 
     prop = promGetProperty("device_type", &len);
-    if (prop && (len > 0)) do {
-	if (!strcmp(prop, "display")) {
-	    prop = promGetProperty("name", &len);
-	    if (!prop || len <= 0)
-		break;
-	    while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
-		prop++;
-	    for (i = 0; sbusDeviceTable[i].devId; i++)
-		if (!strcmp(prop, sbusDeviceTable[i].promName))
-		    break;
-	    devId = sbusDeviceTable[i].devId;
-	    if (!devId)
-		break;
-	    if (!sbus) {
-		if (devId == SBUS_DEVICE_FFB) {
-		    /*
-		     * All /SUNW,ffb outside of SBUS tree come before all
-		     * /SUNW,afb outside of SBUS tree in Linux.
-		     */
-		    if (!strcmp(prop, "afb"))
-			flags |= PROM_NODE_PREF;
-		} else if (devId != SBUS_DEVICE_CG14)
-		    break;
-	    }
-	    for (i = 0; i < 32; i++) {
-		if (!devicePtrs[i] || devicePtrs[i]->devId != devId)
-		    continue;
-		if (devicePtrs[i]->node.node) {
-		    if ((devicePtrs[i]->node.cookie[0] & ~PROM_NODE_SIBLING) <=
-			(flags & ~PROM_NODE_SIBLING))
-			continue;
-		    for (j = i + 1, pNode = devicePtrs[i]->node; j < 32; j++) {
-			if (!devicePtrs[j] || devicePtrs[j]->devId != devId)
-			    continue;
-			pNode2 = devicePtrs[j]->node;
-			devicePtrs[j]->node = pNode;
-			pNode = pNode2;
-		    }
-		}
-		devicePtrs[i]->node.node = node;
-		devicePtrs[i]->node.cookie[0] = flags;
-		devicePtrs[i]->node.cookie[1] = oldnode;
-		break;
-	    }
-	    break;
-	}
-    } while (0);
+    if (prop && (len > 0))
+        do {
+            if (!strcmp(prop, "display")) {
+                prop = promGetProperty("name", &len);
+                if (!prop || len <= 0)
+                    break;
+                while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',')
+                    prop++;
+                for (i = 0; sbusDeviceTable[i].devId; i++)
+                    if (!strcmp(prop, sbusDeviceTable[i].promName))
+                        break;
+                devId = sbusDeviceTable[i].devId;
+                if (!devId)
+                    break;
+                if (!sbus) {
+                    if (devId == SBUS_DEVICE_FFB) {
+                        /*
+                         * All /SUNW,ffb outside of SBUS tree come before all
+                         * /SUNW,afb outside of SBUS tree in Linux.
+                         */
+                        if (!strcmp(prop, "afb"))
+                            flags |= PROM_NODE_PREF;
+                    }
+                    else if (devId != SBUS_DEVICE_CG14)
+                        break;
+                }
+                for (i = 0; i < 32; i++) {
+                    if (!devicePtrs[i] || devicePtrs[i]->devId != devId)
+                        continue;
+                    if (devicePtrs[i]->node.node) {
+                        if ((devicePtrs[i]->node.
+                             cookie[0] & ~PROM_NODE_SIBLING) <=
+                            (flags & ~PROM_NODE_SIBLING))
+                            continue;
+                        for (j = i + 1, pNode = devicePtrs[i]->node; j < 32;
+                             j++) {
+                            if (!devicePtrs[j] || devicePtrs[j]->devId != devId)
+                                continue;
+                            pNode2 = devicePtrs[j]->node;
+                            devicePtrs[j]->node = pNode;
+                            pNode = pNode2;
+                        }
+                    }
+                    devicePtrs[i]->node.node = node;
+                    devicePtrs[i]->node.cookie[0] = flags;
+                    devicePtrs[i]->node.cookie[1] = oldnode;
+                    break;
+                }
+                break;
+            }
+        } while (0);
 
     prop = promGetProperty("name", &len);
     if (prop && len > 0) {
-	if (!strcmp(prop, "sbus") || !strcmp(prop, "sbi"))
-	    sbus = PROM_NODE_SBUS;
+        if (!strcmp(prop, "sbus") || !strcmp(prop, "sbi"))
+            sbus = PROM_NODE_SBUS;
     }
 
     nextnode = promGetChild(node);
     if (nextnode)
-	promWalkAssignNodes(nextnode, node, sbus, devicePtrs);
+        promWalkAssignNodes(nextnode, node, sbus, devicePtrs);
 
     nextnode = promGetSibling(node);
     if (nextnode)
-	promWalkAssignNodes(nextnode, node, PROM_NODE_SIBLING | sbus, devicePtrs);
+        promWalkAssignNodes(nextnode, node, PROM_NODE_SIBLING | sbus,
+                            devicePtrs);
 }
 
 void
@@ -375,63 +390,66 @@ sparcPromAssignNodes(void)
 
     memset(devicePtrs, 0, sizeof(devicePtrs));
     for (psdpp = xf86SbusInfo, n = 0; (psdp = *psdpp); psdpp++, n++) {
-	if (psdp->fbNum != n)
-	    holes = 1;
-	devicePtrs[psdp->fbNum] = psdp;
+        if (psdp->fbNum != n)
+            holes = 1;
+        devicePtrs[psdp->fbNum] = psdp;
     }
     if (holes && (f = fopen("/proc/fb", "r")) != NULL) {
-	/* We could not open one of fb devices, check /proc/fb to see what
-	 * were the types of the cards missed. */
-	char buffer[64];
-	int fbNum, devId;
-	static struct {
-	    int devId;
-	    char *prefix;
-	} procFbPrefixes[] = {
-	    { SBUS_DEVICE_BW2, "BWtwo" },
-	    { SBUS_DEVICE_CG14, "CGfourteen" },
-	    { SBUS_DEVICE_CG6, "CGsix" },
-	    { SBUS_DEVICE_CG3, "CGthree" },
-	    { SBUS_DEVICE_FFB, "Creator" },
-	    { SBUS_DEVICE_FFB, "Elite 3D" },
-	    { SBUS_DEVICE_LEO, "Leo" },
-	    { SBUS_DEVICE_TCX, "TCX" },
-	    { 0, NULL },
-	};
-
-	while (fscanf(f, "%d %63s\n", &fbNum, buffer) == 2) {
-	    for (i = 0; procFbPrefixes[i].devId; i++)
-		if (! strncmp(procFbPrefixes[i].prefix, buffer,
-		      strlen(procFbPrefixes[i].prefix)))
-		    break;
-	    devId = procFbPrefixes[i].devId;
-	    if (! devId) continue;
-	    if (devicePtrs[fbNum]) {
-		if (devicePtrs[fbNum]->devId != devId)
-		    xf86ErrorF("Inconsistent /proc/fb with FBIOGATTR\n");
-	    } else if (!devicePtrs[fbNum]) {
-		devicePtrs[fbNum] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
-		psdp->devId = devId;
-		psdp->fbNum = fbNum;
-		psdp->fd = -2;
-	    }
-	}
-	fclose(f);
+        /* We could not open one of fb devices, check /proc/fb to see what
+         * were the types of the cards missed. */
+        char buffer[64];
+        int fbNum, devId;
+        static struct {
+            int devId;
+            char *prefix;
+        } procFbPrefixes[] = {
+            {
+            SBUS_DEVICE_BW2, "BWtwo"}, {
+            SBUS_DEVICE_CG14, "CGfourteen"}, {
+            SBUS_DEVICE_CG6, "CGsix"}, {
+            SBUS_DEVICE_CG3, "CGthree"}, {
+            SBUS_DEVICE_FFB, "Creator"}, {
+            SBUS_DEVICE_FFB, "Elite 3D"}, {
+            SBUS_DEVICE_LEO, "Leo"}, {
+            SBUS_DEVICE_TCX, "TCX"}, {
+        0, NULL},};
+
+        while (fscanf(f, "%d %63s\n", &fbNum, buffer) == 2) {
+            for (i = 0; procFbPrefixes[i].devId; i++)
+                if (!strncmp(procFbPrefixes[i].prefix, buffer,
+                             strlen(procFbPrefixes[i].prefix)))
+                    break;
+            devId = procFbPrefixes[i].devId;
+            if (!devId)
+                continue;
+            if (devicePtrs[fbNum]) {
+                if (devicePtrs[fbNum]->devId != devId)
+                    xf86ErrorF("Inconsistent /proc/fb with FBIOGATTR\n");
+            }
+            else if (!devicePtrs[fbNum]) {
+                devicePtrs[fbNum] = psdp = xnfcalloc(sizeof(sbusDevice), 1);
+                psdp->devId = devId;
+                psdp->fbNum = fbNum;
+                psdp->fd = -2;
+            }
+        }
+        fclose(f);
     }
     promGetSibling(0);
     promWalkAssignNodes(promRootNode, 0, PROM_NODE_PREF, devicePtrs);
     for (i = 0, j = 0; i < 32; i++)
-	if (devicePtrs[i] && devicePtrs[i]->fbNum == -1)
-	    j++;
+        if (devicePtrs[i] && devicePtrs[i]->fbNum == -1)
+            j++;
     xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (n + j + 1));
     for (i = 0, psdpp = xf86SbusInfo; i < 32; i++)
-	if (devicePtrs[i]) {
-	    if (devicePtrs[i]->fbNum == -1) {
-		memmove(psdpp + 1, psdpp, sizeof(psdpp) * (n + 1));
-		*psdpp = devicePtrs[i];
-	    } else
-		n--;
-	}
+        if (devicePtrs[i]) {
+            if (devicePtrs[i]->fbNum == -1) {
+                memmove(psdpp + 1, psdpp, sizeof(psdpp) * (n + 1));
+                *psdpp = devicePtrs[i];
+            }
+            else
+                n--;
+        }
 }
 
 static char *
@@ -444,37 +462,43 @@ promGetReg(int type)
     regstr[0] = 0;
     prop = promGetProperty("reg", &len);
     if (prop && len >= 4) {
-	unsigned int *reg = (unsigned int *)prop;
-	if (!promP1275 || (type == PROM_NODE_SBUS) || (type == PROM_NODE_EBUS))
-	    snprintf (regstr, sizeof(regstr), "@%x,%x", reg[0], reg[1]);
-	else if (type == PROM_NODE_PCI) {
-	    if ((reg[0] >> 8) & 7)
-		snprintf (regstr, sizeof(regstr), "@%x,%x", (reg[0] >> 11) & 0x1f, (reg[0] >> 8) & 7);
-	    else
-		snprintf (regstr, sizeof(regstr), "@%x", (reg[0] >> 11) & 0x1f);
-	} else if (len == 4)
-	    snprintf (regstr, sizeof(regstr), "@%x", reg[0]);
-	else {
-	    unsigned int regs[2];
-
-	    /* Things get more complicated on UPA. If upa-portid exists,
-	       then address is @upa-portid,second-int-in-reg, otherwise
-	       it is @first-int-in-reg/16,second-int-in-reg (well, probably
-	       upa-portid always exists, but just to be safe). */
-	    memcpy (regs, reg, sizeof(regs));
-	    prop = promGetProperty("upa-portid", &len);
-	    if (prop && len == 4) {
-		reg = (unsigned int *)prop;
-		snprintf (regstr, sizeof(regstr), "@%x,%x", reg[0], regs[1]);
-	    } else
-		snprintf (regstr, sizeof(regstr), "@%x,%x", regs[0] >> 4, regs[1]);
-	}
+        unsigned int *reg = (unsigned int *) prop;
+
+        if (!promP1275 || (type == PROM_NODE_SBUS) || (type == PROM_NODE_EBUS))
+            snprintf(regstr, sizeof(regstr), "@%x,%x", reg[0], reg[1]);
+        else if (type == PROM_NODE_PCI) {
+            if ((reg[0] >> 8) & 7)
+                snprintf(regstr, sizeof(regstr), "@%x,%x",
+                         (reg[0] >> 11) & 0x1f, (reg[0] >> 8) & 7);
+            else
+                snprintf(regstr, sizeof(regstr), "@%x", (reg[0] >> 11) & 0x1f);
+        }
+        else if (len == 4)
+            snprintf(regstr, sizeof(regstr), "@%x", reg[0]);
+        else {
+            unsigned int regs[2];
+
+            /* Things get more complicated on UPA. If upa-portid exists,
+               then address is @upa-portid,second-int-in-reg, otherwise
+               it is @first-int-in-reg/16,second-int-in-reg (well, probably
+               upa-portid always exists, but just to be safe). */
+            memcpy(regs, reg, sizeof(regs));
+            prop = promGetProperty("upa-portid", &len);
+            if (prop && len == 4) {
+                reg = (unsigned int *) prop;
+                snprintf(regstr, sizeof(regstr), "@%x,%x", reg[0], regs[1]);
+            }
+            else
+                snprintf(regstr, sizeof(regstr), "@%x,%x", regs[0] >> 4,
+                         regs[1]);
+        }
     }
     return regstr;
 }
 
 static int
-promWalkNode2Pathname(char *path, int parent, int node, int searchNode, int type)
+promWalkNode2Pathname(char *path, int parent, int node, int searchNode,
+                      int type)
 {
     int nextnode;
     int len, ntype = type;
@@ -483,27 +507,28 @@ promWalkNode2Pathname(char *path, int parent, int node, int searchNode, int type
     prop = promGetProperty("name", &len);
     *path = '/';
     if (!prop || len <= 0)
-	return 0;
+        return 0;
     if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
-	ntype = PROM_NODE_SBUS;
+        ntype = PROM_NODE_SBUS;
     else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
-	ntype = PROM_NODE_EBUS;
+        ntype = PROM_NODE_EBUS;
     else if (!strcmp(prop, "pci") && !type)
-	ntype = PROM_NODE_PCI;
-    strcpy (path + 1, prop);
+        ntype = PROM_NODE_PCI;
+    strcpy(path + 1, prop);
     p = promGetReg(type);
     if (*p)
-	strcat (path, p);
+        strcat(path, p);
     if (node == searchNode)
-	return 1;
+        return 1;
     nextnode = promGetChild(node);
     if (nextnode &&
-	promWalkNode2Pathname(strchr(path, 0), node, nextnode, searchNode, ntype))
-	return 1;
+        promWalkNode2Pathname(strchr(path, 0), node, nextnode, searchNode,
+                              ntype))
+        return 1;
     nextnode = promGetSibling(node);
     if (nextnode &&
-	promWalkNode2Pathname(path, parent, nextnode, searchNode, type))
-	return 1;
+        promWalkNode2Pathname(path, parent, nextnode, searchNode, type))
+        return 1;
     return 0;
 }
 
@@ -512,11 +537,14 @@ sparcPromNode2Pathname(sbusPromNodePtr pnode)
 {
     char *ret;
 
-    if (!pnode->node) return NULL;
+    if (!pnode->node)
+        return NULL;
     ret = malloc(4096);
-    if (!ret) return NULL;
-    if (promWalkNode2Pathname(ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
-	return ret;
+    if (!ret)
+        return NULL;
+    if (promWalkNode2Pathname
+        (ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
+        return ret;
     free(ret);
     return NULL;
 }
@@ -528,51 +556,52 @@ promWalkPathname2Node(char *name, char *regstr, int parent, int type)
     char *prop, *p;
 
     for (;;) {
-	prop = promGetProperty("name", &len);
-	if (!prop || len <= 0)
-	    return 0;
-	if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
-	    type = PROM_NODE_SBUS;
-	else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
-	    type = PROM_NODE_EBUS;
-	else if (!strcmp(prop, "pci") && !type)
-	    type = PROM_NODE_PCI;
-	for (node = promGetChild(parent); node; node = promGetSibling(node)) {
-	    prop = promGetProperty("name", &len);
-	    if (!prop || len <= 0)
-		continue;
-	    if (*name && strcmp(name, prop))
-		continue;
-	    if (*regstr) {
-		p = promGetReg(type);
-		if (! *p || strcmp(p + 1, regstr))
-		    continue;
-	    }
-	    break;
-	}
-	if (!node) {
-	    for (node = promGetChild(parent); node; node = promGetSibling(node)) {
-		ret = promWalkPathname2Node(name, regstr, node, type);
-		if (ret) return ret;
-	    }
-	    return 0;
-	}
-	name = strchr(regstr, 0) + 1;
-	if (! *name)
-	    return node;
-	p = strchr(name, '/');
-	if (p)
-	    *p = 0;
-	else
-	    p = strchr(name, 0);
-	regstr = strchr(name, '@');
-	if (regstr)
-	    *regstr++ = 0;
-	else
-	    regstr = p;
-	if (name == regstr)
-	    return 0;
-	parent = node;
+        prop = promGetProperty("name", &len);
+        if (!prop || len <= 0)
+            return 0;
+        if ((!strcmp(prop, "sbus") || !strcmp(prop, "sbi")) && !type)
+            type = PROM_NODE_SBUS;
+        else if (!strcmp(prop, "ebus") && type == PROM_NODE_PCI)
+            type = PROM_NODE_EBUS;
+        else if (!strcmp(prop, "pci") && !type)
+            type = PROM_NODE_PCI;
+        for (node = promGetChild(parent); node; node = promGetSibling(node)) {
+            prop = promGetProperty("name", &len);
+            if (!prop || len <= 0)
+                continue;
+            if (*name && strcmp(name, prop))
+                continue;
+            if (*regstr) {
+                p = promGetReg(type);
+                if (!*p || strcmp(p + 1, regstr))
+                    continue;
+            }
+            break;
+        }
+        if (!node) {
+            for (node = promGetChild(parent); node; node = promGetSibling(node)) {
+                ret = promWalkPathname2Node(name, regstr, node, type);
+                if (ret)
+                    return ret;
+            }
+            return 0;
+        }
+        name = strchr(regstr, 0) + 1;
+        if (!*name)
+            return node;
+        p = strchr(name, '/');
+        if (p)
+            *p = 0;
+        else
+            p = strchr(name, 0);
+        regstr = strchr(name, '@');
+        if (regstr)
+            *regstr++ = 0;
+        else
+            regstr = p;
+        if (name == regstr)
+            return 0;
+        parent = node;
     }
 }
 
@@ -584,23 +613,24 @@ sparcPromPathname2Node(const char *pathName)
 
     i = strlen(pathName);
     name = malloc(i + 2);
-    if (! name) return 0;
-    strcpy (name, pathName);
-    name [i + 1] = 0;
+    if (!name)
+        return 0;
+    strcpy(name, pathName);
+    name[i + 1] = 0;
     if (name[0] != '/')
-	return 0;
+        return 0;
     p = strchr(name + 1, '/');
     if (p)
-	*p = 0;
+        *p = 0;
     else
-	p = strchr(name, 0);
+        p = strchr(name, 0);
     regstr = strchr(name, '@');
     if (regstr)
-	*regstr++ = 0;
+        *regstr++ = 0;
     else
-	regstr = p;
+        regstr = p;
     if (name + 1 == regstr)
-	return 0;
+        return 0;
     promGetSibling(0);
     i = promWalkPathname2Node(name + 1, regstr, promRootNode, 0);
     free(name);
@@ -616,32 +646,33 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
     unsigned long len = ((offset + size + pagemask) & ~pagemask) - off;
 
     if (psdp->fd == -1) {
-	psdp->fd = open(psdp->device, O_RDWR);
-	if (psdp->fd == -1)
-	    return NULL;
-    } else if (psdp->fd < 0)
-	return NULL;
-
-    ret = (pointer) mmap (NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
-			  psdp->fd, off);
+        psdp->fd = open(psdp->device, O_RDWR);
+        if (psdp->fd == -1)
+            return NULL;
+    }
+    else if (psdp->fd < 0)
+        return NULL;
+
+    ret = (pointer) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+                         psdp->fd, off);
     if (ret == (pointer) -1) {
-	ret = (pointer) mmap (NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
-			      psdp->fd, off);
+        ret = (pointer) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
+                             psdp->fd, off);
     }
     if (ret == (pointer) -1)
-	return NULL;
+        return NULL;
 
-    return (char *)ret + (offset - off);
+    return (char *) ret + (offset - off);
 }
 
 void
 xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
 {
     unsigned long mask = getpagesize() - 1;
-    unsigned long base = (unsigned long)addr & ~mask;
-    unsigned long len = (((unsigned long)addr + size + mask) & ~mask) - base;
+    unsigned long base = (unsigned long) addr & ~mask;
+    unsigned long len = (((unsigned long) addr + size + mask) & ~mask) - base;
 
-    munmap ((pointer)base, len);
+    munmap((pointer) base, len);
 }
 
 /* Tell OS that we are driving the HW cursor ourselves. */
@@ -657,8 +688,8 @@ xf86SbusHideOsHwCursor(sbusDevicePtr psdp)
     fbcursor.cmap.red = zeros;
     fbcursor.cmap.green = zeros;
     fbcursor.cmap.blue = zeros;
-    fbcursor.image = (char *)zeros;
-    fbcursor.mask = (char *)zeros;
+    fbcursor.image = (char *) zeros;
+    fbcursor.mask = (char *) zeros;
     fbcursor.size.x = 32;
     fbcursor.size.y = 1;
     fbcursor.set = FB_CUR_SETALL;
diff --git a/xorg-server/hw/xfree86/os-support/bus/nobus.c b/xorg-server/hw/xfree86/os-support/bus/nobus.c
index ad23f5288..dca58fee2 100644
--- a/xorg-server/hw/xfree86/os-support/bus/nobus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/nobus.c
@@ -1 +1,5 @@
-static void __noop_to_appease_ar__() { return; }
+static void
+__noop_to_appease_ar__()
+{
+    return;
+}
diff --git a/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h b/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h
index 74ead201e..f69e55b39 100644
--- a/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/xorg-server/hw/xfree86/os-support/bus/xf86Pci.h
@@ -95,7 +95,6 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-
 /*
  * This file contains just the public interface to the PCI code.
  * Drivers should use this file rather than Pci.h.
@@ -234,8 +233,8 @@
  */
 
 /* Primitive Types */
-typedef unsigned long ADDRESS;		/* Memory/PCI address */
-typedef unsigned long IOADDRESS _X_DEPRECATED;	/* Must be large enough for a pointer */
+typedef unsigned long ADDRESS;  /* Memory/PCI address */
+typedef unsigned long IOADDRESS _X_DEPRECATED;  /* Must be large enough for a pointer */
 typedef CARD32 PCITAG _X_DEPRECATED;
 
 typedef enum {
@@ -249,12 +248,12 @@ typedef enum {
     PCI_IO_SPARSE_MASK
 } PciAddrType;
 
-
 /* Public PCI access functions */
 extern _X_EXPORT Bool xf86scanpci(void);
 
 /* Domain access functions.  Some of these probably shouldn't be public */
 extern _X_EXPORT struct pci_io_handle *xf86MapLegacyIO(struct pci_device *dev);
-extern _X_EXPORT void xf86UnmapLegacyIO(struct pci_device *, struct pci_io_handle *);
+extern _X_EXPORT void xf86UnmapLegacyIO(struct pci_device *,
+                                        struct pci_io_handle *);
 
-#endif /* _XF86PCI_H */
+#endif                          /* _XF86PCI_H */