libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 374 insertions, 337 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.c b/xorg-server/hw/xfree86/common/xf86sbusBus.c
index b7bb913fe..c993b603c 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.c
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.c
@@ -53,23 +53,24 @@ CheckSbusDevice(const char *device, int fbNum)
 
     fd = open(device, O_RDONLY, 0);
     if (fd < 0)
-	return;
+        return;
     memset(&fbattr, 0, sizeof(fbattr));
     if (ioctl(fd, FBIOGATTR, &fbattr) < 0) {
-	if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {
-	    close(fd);
-	    return;
-	}
+        if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {
+            close(fd);
+            return;
+        }
     }
     close(fd);
     for (i = 0; sbusDeviceTable[i].devId; i++)
-	if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)
-	    break;
-    if (! sbusDeviceTable[i].devId)
-	return;
-    xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));
+        if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)
+            break;
+    if (!sbusDeviceTable[i].devId)
+        return;
+    xf86SbusInfo =
+        xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));
     xf86SbusInfo[xf86nSbusInfo] = NULL;
-    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
+    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof(sbusDevice), 1);
     psdp->devId = sbusDeviceTable[i].devId;
     psdp->fbNum = fbNum;
     psdp->device = xnfstrdup(device);
@@ -88,136 +89,154 @@ xf86SbusProbe(void)
     xf86SbusInfo = malloc(sizeof(psdp));
     *xf86SbusInfo = NULL;
     for (i = 0; i < 32; i++) {
-	snprintf(fbDevName, sizeof(fbDevName), "/dev/fb%d", i);
-	CheckSbusDevice(fbDevName, i);
+        snprintf(fbDevName, sizeof(fbDevName), "/dev/fb%d", i);
+        CheckSbusDevice(fbDevName, i);
     }
     if (sparcPromInit() >= 0) {
-	useProm = 1;
-	sparcPromAssignNodes();
+        useProm = 1;
+        sparcPromAssignNodes();
     }
     for (psdpp = xf86SbusInfo; (psdp = *psdpp); psdpp++) {
-	for (i = 0; sbusDeviceTable[i].devId; i++)
-	    if (sbusDeviceTable[i].devId == psdp->devId)
-		psdp->descr = sbusDeviceTable[i].descr;
-	/*
-	 * If we can use PROM information and found the PROM node for this
-	 * device, we can tell more about the card.
-	 */
-	if (useProm && psdp->node.node) {
-	    char *prop, *promPath;
-	    int len, chiprev, vmsize;
-
-	    switch (psdp->devId) {
-	    case SBUS_DEVICE_MGX:
-		prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);
-		if (prop && len == 4 && *(int *)prop == 0x400000)
-		    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";
-		break;
-	    case SBUS_DEVICE_CG6:
-		chiprev = 0;
-		vmsize = 0;
-		prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);
-		if (prop && len == 4)
-		    chiprev = *(int *)prop;
-		prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);
-		if (prop && len == 4)
-		    vmsize = *(int *)prop;
-		switch (chiprev) {
-		case 1:
-		case 2:
-		case 3:
-		case 4:
-		    psdp->descr = "Sun Double width GX"; break;
-		case 5:
-		case 6:
-		case 7:
-		case 8:
-		case 9:
-		    psdp->descr = "Sun Single width GX"; break;
-		case 11:
-		    switch (vmsize) {
-		    case 2:
-			psdp->descr = "Sun Turbo GX with 1M VSIMM"; break;
-		    case 4:
-			psdp->descr = "Sun Turbo GX Plus"; break;
-		    default:
-			psdp->descr = "Sun Turbo GX"; break;
-		    }
-		}
-		break;
-	    case SBUS_DEVICE_CG14:
-		prop = sparcPromGetProperty(&psdp->node, "reg", &len);
-		vmsize = 0;
-		if (prop && !(len % 12) && len > 0)
-		    vmsize = *(int *)(prop + len - 4);
-		switch (vmsize) {
-		case 0x400000:
-		    psdp->descr = "Sun SX with 4M VSIMM"; break;
-		case 0x800000:
-		    psdp->descr = "Sun SX with 8M VSIMM"; break;
-		}
-		break;
-	    case SBUS_DEVICE_LEO:
-		prop = sparcPromGetProperty(&psdp->node, "model", &len);
-		if (prop && len > 0 && !strstr(prop, "501-2503"))
-		    psdp->descr = "Sun Turbo ZX";
-		break;
-	    case SBUS_DEVICE_TCX:
-		if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))
-		    psdp->descr = "Sun TCX (8bit)";
-		else
-		    psdp->descr = "Sun TCX (S24)";
-		break;
-	    case SBUS_DEVICE_FFB:
-		prop = sparcPromGetProperty(&psdp->node, "name", &len);
-		chiprev = 0;
-		prop = sparcPromGetProperty(&psdp->node, "board_type", &len);
-		if (prop && len == 4)
-		    chiprev = *(int *)prop;
-		if (strstr (prop, "afb")) {
-		    if (chiprev == 3)
-			psdp->descr = "Sun|Elite3D-M6 Horizontal";
-		} else {
-		    switch (chiprev) {
-		    case 0x08:
-			psdp->descr = "Sun FFB 67MHz Creator"; break;
-		    case 0x0b:
-			psdp->descr = "Sun FFB 67MHz Creator 3D"; break;
-		    case 0x1b:
-			psdp->descr = "Sun FFB 75MHz Creator 3D"; break;
-		    case 0x20:
-		    case 0x28:
-			psdp->descr = "Sun FFB2 Vertical Creator"; break;
-		    case 0x23:
-		    case 0x2b:
-			psdp->descr = "Sun FFB2 Vertical Creator 3D"; break;
-		    case 0x30:
-			psdp->descr = "Sun FFB2+ Vertical Creator"; break;
-		    case 0x33:
-			psdp->descr = "Sun FFB2+ Vertical Creator 3D"; break;
-		    case 0x40:
-		    case 0x48:
-			psdp->descr = "Sun FFB2 Horizontal Creator"; break;
-		    case 0x43:
-		    case 0x4b:
-			psdp->descr = "Sun FFB2 Horizontal Creator 3D"; break;
-		    }
-		}
-		break;
-	    }
-
-	    xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
-	    promPath = sparcPromNode2Pathname (&psdp->node);
-	    if (promPath) {
-		xf86ErrorF(" at %s", promPath);
-		free(promPath);
-	    }
-	} else
-	    xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
-	xf86ErrorF("\n");
+        for (i = 0; sbusDeviceTable[i].devId; i++)
+            if (sbusDeviceTable[i].devId == psdp->devId)
+                psdp->descr = sbusDeviceTable[i].descr;
+        /*
+         * If we can use PROM information and found the PROM node for this
+         * device, we can tell more about the card.
+         */
+        if (useProm && psdp->node.node) {
+            char *prop, *promPath;
+            int len, chiprev, vmsize;
+
+            switch (psdp->devId) {
+            case SBUS_DEVICE_MGX:
+                prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);
+                if (prop && len == 4 && *(int *) prop == 0x400000)
+                    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";
+                break;
+            case SBUS_DEVICE_CG6:
+                chiprev = 0;
+                vmsize = 0;
+                prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);
+                if (prop && len == 4)
+                    chiprev = *(int *) prop;
+                prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);
+                if (prop && len == 4)
+                    vmsize = *(int *) prop;
+                switch (chiprev) {
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                    psdp->descr = "Sun Double width GX";
+                    break;
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                    psdp->descr = "Sun Single width GX";
+                    break;
+                case 11:
+                    switch (vmsize) {
+                    case 2:
+                        psdp->descr = "Sun Turbo GX with 1M VSIMM";
+                        break;
+                    case 4:
+                        psdp->descr = "Sun Turbo GX Plus";
+                        break;
+                    default:
+                        psdp->descr = "Sun Turbo GX";
+                        break;
+                    }
+                }
+                break;
+            case SBUS_DEVICE_CG14:
+                prop = sparcPromGetProperty(&psdp->node, "reg", &len);
+                vmsize = 0;
+                if (prop && !(len % 12) && len > 0)
+                    vmsize = *(int *) (prop + len - 4);
+                switch (vmsize) {
+                case 0x400000:
+                    psdp->descr = "Sun SX with 4M VSIMM";
+                    break;
+                case 0x800000:
+                    psdp->descr = "Sun SX with 8M VSIMM";
+                    break;
+                }
+                break;
+            case SBUS_DEVICE_LEO:
+                prop = sparcPromGetProperty(&psdp->node, "model", &len);
+                if (prop && len > 0 && !strstr(prop, "501-2503"))
+                    psdp->descr = "Sun Turbo ZX";
+                break;
+            case SBUS_DEVICE_TCX:
+                if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))
+                    psdp->descr = "Sun TCX (8bit)";
+                else
+                    psdp->descr = "Sun TCX (S24)";
+                break;
+            case SBUS_DEVICE_FFB:
+                prop = sparcPromGetProperty(&psdp->node, "name", &len);
+                chiprev = 0;
+                prop = sparcPromGetProperty(&psdp->node, "board_type", &len);
+                if (prop && len == 4)
+                    chiprev = *(int *) prop;
+                if (strstr(prop, "afb")) {
+                    if (chiprev == 3)
+                        psdp->descr = "Sun|Elite3D-M6 Horizontal";
+                }
+                else {
+                    switch (chiprev) {
+                    case 0x08:
+                        psdp->descr = "Sun FFB 67MHz Creator";
+                        break;
+                    case 0x0b:
+                        psdp->descr = "Sun FFB 67MHz Creator 3D";
+                        break;
+                    case 0x1b:
+                        psdp->descr = "Sun FFB 75MHz Creator 3D";
+                        break;
+                    case 0x20:
+                    case 0x28:
+                        psdp->descr = "Sun FFB2 Vertical Creator";
+                        break;
+                    case 0x23:
+                    case 0x2b:
+                        psdp->descr = "Sun FFB2 Vertical Creator 3D";
+                        break;
+                    case 0x30:
+                        psdp->descr = "Sun FFB2+ Vertical Creator";
+                        break;
+                    case 0x33:
+                        psdp->descr = "Sun FFB2+ Vertical Creator 3D";
+                        break;
+                    case 0x40:
+                    case 0x48:
+                        psdp->descr = "Sun FFB2 Horizontal Creator";
+                        break;
+                    case 0x43:
+                    case 0x4b:
+                        psdp->descr = "Sun FFB2 Horizontal Creator 3D";
+                        break;
+                    }
+                }
+                break;
+            }
+
+            xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
+            promPath = sparcPromNode2Pathname(&psdp->node);
+            if (promPath) {
+                xf86ErrorF(" at %s", promPath);
+                free(promPath);
+            }
+        }
+        else
+            xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
+        xf86ErrorF("\n");
     }
     if (useProm)
-	sparcPromClose();
+        sparcPromClose();
 }
 
 /*
@@ -240,52 +259,55 @@ xf86ParseSbusBusString(const char *busID, int *fbNum)
     int i, len;
 
     if (StringToBusType(busID, &id) != BUS_SBUS)
-	return FALSE;
+        return FALSE;
 
     if (*id != '/') {
-	if (!strncmp (id, "fb", 2)) {
-	    if (!isdigit(id[2]))
-		return FALSE;
-	    *fbNum = atoi(id + 2);
-	    return TRUE;
-	} else {
-	    sbusDevicePtr *psdpp;
-	    int devId;
-
-	    for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {
-		len = strlen(sbusDeviceTable[i].promName);
-		if (!strncmp (sbusDeviceTable[i].promName, id, len)
-		    && isdigit(id[len]))
-		    break;
-	    }
-	    devId = sbusDeviceTable[i].devId;
-	    if (!devId) return FALSE;
-	    i = atoi(id + len);
-	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
-		if ((*psdpp)->devId != devId)
-		    continue;
-		if (!i) {
-		    *fbNum = (*psdpp)->fbNum;
-		    return TRUE;
-		}
-		i--;
-	    }
-	}
-	return FALSE;
+        if (!strncmp(id, "fb", 2)) {
+            if (!isdigit(id[2]))
+                return FALSE;
+            *fbNum = atoi(id + 2);
+            return TRUE;
+        }
+        else {
+            sbusDevicePtr *psdpp;
+            int devId;
+
+            for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {
+                len = strlen(sbusDeviceTable[i].promName);
+                if (!strncmp(sbusDeviceTable[i].promName, id, len)
+                    && isdigit(id[len]))
+                    break;
+            }
+            devId = sbusDeviceTable[i].devId;
+            if (!devId)
+                return FALSE;
+            i = atoi(id + len);
+            for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+                if ((*psdpp)->devId != devId)
+                    continue;
+                if (!i) {
+                    *fbNum = (*psdpp)->fbNum;
+                    return TRUE;
+                }
+                i--;
+            }
+        }
+        return FALSE;
     }
 
     if (sparcPromInit() >= 0) {
-	i = sparcPromPathname2Node(id);
-	sparcPromClose();
-	if (i) {
-	    sbusDevicePtr *psdpp;
-	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
-		if ((*psdpp)->node.node == i) {
-		    *fbNum = (*psdpp)->fbNum;
-		    return TRUE;
-		}
-	    }
-	}
+        i = sparcPromPathname2Node(id);
+        sparcPromClose();
+        if (i) {
+            sbusDevicePtr *psdpp;
+
+            for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+                if ((*psdpp)->node.node == i) {
+                    *fbNum = (*psdpp)->fbNum;
+                    return TRUE;
+                }
+            }
+        }
     }
     return FALSE;
 }
@@ -300,9 +322,10 @@ xf86CompareSbusBusString(const char *busID, int fbNum)
     int iFbNum;
 
     if (xf86ParseSbusBusString(busID, &iFbNum)) {
-	return fbNum == iFbNum;
-    } else {
-	return FALSE;
+        return fbNum == iFbNum;
+    }
+    else {
+        return FALSE;
     }
 }
 
@@ -317,10 +340,10 @@ xf86CheckSbusSlot(int fbNum)
     EntityPtr p;
 
     for (i = 0; i < xf86NumEntities; i++) {
-	p = xf86Entities[i];
-	/* Check if this SBUS slot is taken */
-	if (p->bus.type == BUS_SBUS && p->bus.id.sbus.fbNum == fbNum)
-	    return FALSE;
+        p = xf86Entities[i];
+        /* Check if this SBUS slot is taken */
+        if (p->bus.type == BUS_SBUS && p->bus.id.sbus.fbNum == fbNum)
+            return FALSE;
     }
 
     return TRUE;
@@ -332,8 +355,7 @@ xf86CheckSbusSlot(int fbNum)
  */
 
 int
-xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,
-		  GDevPtr dev, Bool active)
+xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, GDevPtr dev, Bool active)
 {
     EntityPtr p = NULL;
 
@@ -349,18 +371,19 @@ xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,
         p->bus.id.sbus.fbNum = psdp->fbNum;
         p->active = active;
         p->inUse = FALSE;
-	sbusSlotClaimed = TRUE;
-	return num;
-    } else
-	return -1;
+        sbusSlotClaimed = TRUE;
+        return num;
+    }
+    else
+        return -1;
 }
 
 int
-xf86MatchSbusInstances(const char *driverName, int sbusDevId, 
-		       GDevPtr *devList, int numDevs, DriverPtr drvp,
-		       int **foundEntities)
+xf86MatchSbusInstances(const char *driverName, int sbusDevId,
+                       GDevPtr * devList, int numDevs, DriverPtr drvp,
+                       int **foundEntities)
 {
-    int i,j;
+    int i, j;
     sbusDevicePtr psdp, *psdpp;
     int numClaimedInstances = 0;
     int allocatedInstances = 0;
@@ -371,24 +394,24 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
     int useProm = 0;
 
     struct Inst {
-	sbusDevicePtr	sbus;
-	GDevPtr		dev;
-	Bool		claimed;  /* BusID matches with a device section */
+        sbusDevicePtr sbus;
+        GDevPtr dev;
+        Bool claimed;           /* BusID matches with a device section */
     } *instances = NULL;
 
     *foundEntities = NULL;
     for (psdpp = xf86SbusInfo, psdp = *psdpp; psdp; psdp = *++psdpp) {
-	if (psdp->devId != sbusDevId)
-	    continue;
-	if (psdp->fd == -2)
-	    continue;
-	++allocatedInstances;
-	instances = xnfrealloc(instances,
-			       allocatedInstances * sizeof(struct Inst));
-	instances[allocatedInstances - 1].sbus = psdp;
-	instances[allocatedInstances - 1].dev = NULL;
-	instances[allocatedInstances - 1].claimed = FALSE;
-	numFound++;
+        if (psdp->devId != sbusDevId)
+            continue;
+        if (psdp->fd == -2)
+            continue;
+        ++allocatedInstances;
+        instances = xnfrealloc(instances,
+                               allocatedInstances * sizeof(struct Inst));
+        instances[allocatedInstances - 1].sbus = psdp;
+        instances[allocatedInstances - 1].dev = NULL;
+        instances[allocatedInstances - 1].claimed = FALSE;
+        numFound++;
     }
 
     /*
@@ -397,88 +420,97 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
      * allow the config file to override this.
      */
     if (allocatedInstances <= 0) {
-	free(instances);
-	return 0;
+        free(instances);
+        return 0;
     }
 
     if (sparcPromInit() >= 0)
-	useProm = 1;
+        useProm = 1;
 
     if (xf86DoConfigure && xf86DoConfigurePass1) {
-	GDevPtr pGDev;
-	int actualcards = 0;
-	for (i = 0; i < allocatedInstances; i++) {
-	    actualcards++;
-	    pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,
-						instances[i].sbus, -1);
-	    if (pGDev) {
-		/*
-		 * XF86Match???Instances() treat chipID and chipRev as
-		 * overrides, so clobber them here.
-		 */
-		pGDev->chipID = pGDev->chipRev = -1;
-	    }
-	}
-	free(instances);
-	if (useProm)
-	    sparcPromClose();
-	return actualcards;
+        GDevPtr pGDev;
+        int actualcards = 0;
+
+        for (i = 0; i < allocatedInstances; i++) {
+            actualcards++;
+            pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,
+                                                instances[i].sbus, -1);
+            if (pGDev) {
+                /*
+                 * XF86Match???Instances() treat chipID and chipRev as
+                 * overrides, so clobber them here.
+                 */
+                pGDev->chipID = pGDev->chipRev = -1;
+            }
+        }
+        free(instances);
+        if (useProm)
+            sparcPromClose();
+        return actualcards;
     }
 
     DebugF("%s instances found: %d\n", driverName, allocatedInstances);
 
     for (i = 0; i < allocatedInstances; i++) {
-	char *promPath = NULL;
-
-	psdp = instances[i].sbus;
-	devBus = NULL;
-	dev = NULL;
-	if (useProm && psdp->node.node)
-	    promPath = sparcPromNode2Pathname(&psdp->node);
-
-	for (j = 0; j < numDevs; j++) {
-	    if (devList[j]->busID && *devList[j]->busID) {
-		if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
-		    if (devBus)
-			xf86MsgVerb(X_WARNING,0,
-			    "%s: More than one matching Device section for "
-			    "instance (BusID: %s) found: %s\n",
-			    driverName,devList[j]->identifier,
-			    devList[j]->busID);
-		    else
-			devBus = devList[j];
-		} 
-	    } else {
-		if (!dev && !devBus) {
-		    if (promPath)
-			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:%s\n",
-				promPath);
-		    else
-			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:fb%d\n",
-				psdp->fbNum);
-		    dev = devList[j];
-		} else
-		    xf86MsgVerb(X_WARNING, 0,
-			    "%s: More than one matching Device section "
-			    "found: %s\n", driverName, devList[j]->identifier);
-	    }
-	}
-	if (devBus) dev = devBus;  /* busID preferred */ 
-	if (!dev && psdp->fd != -2) {
-	    if (promPath) {
-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
-			    "for instance (BusID SBUS:%s) found\n",
-			    driverName, promPath);
-	    } else
-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
-			    "for instance (BusID SBUS:fb%d) found\n",
-			    driverName, psdp->fbNum);
-	} else if (dev) {
-	    numClaimedInstances++;
-	    instances[i].claimed = TRUE;
-	    instances[i].dev = dev;
-	}
-	free(promPath);
+        char *promPath = NULL;
+
+        psdp = instances[i].sbus;
+        devBus = NULL;
+        dev = NULL;
+        if (useProm && psdp->node.node)
+            promPath = sparcPromNode2Pathname(&psdp->node);
+
+        for (j = 0; j < numDevs; j++) {
+            if (devList[j]->busID && *devList[j]->busID) {
+                if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
+                    if (devBus)
+                        xf86MsgVerb(X_WARNING, 0,
+                                    "%s: More than one matching Device section for "
+                                    "instance (BusID: %s) found: %s\n",
+                                    driverName, devList[j]->identifier,
+                                    devList[j]->busID);
+                    else
+                        devBus = devList[j];
+                }
+            }
+            else {
+                if (!dev && !devBus) {
+                    if (promPath)
+                        xf86Msg(X_PROBED,
+                                "Assigning device section with no busID to SBUS:%s\n",
+                                promPath);
+                    else
+                        xf86Msg(X_PROBED,
+                                "Assigning device section with no busID to SBUS:fb%d\n",
+                                psdp->fbNum);
+                    dev = devList[j];
+                }
+                else
+                    xf86MsgVerb(X_WARNING, 0,
+                                "%s: More than one matching Device section "
+                                "found: %s\n", driverName,
+                                devList[j]->identifier);
+            }
+        }
+        if (devBus)
+            dev = devBus;       /* busID preferred */
+        if (!dev && psdp->fd != -2) {
+            if (promPath) {
+                xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+                            "for instance (BusID SBUS:%s) found\n",
+                            driverName, promPath);
+            }
+            else
+                xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+                            "for instance (BusID SBUS:fb%d) found\n",
+                            driverName, psdp->fbNum);
+        }
+        else if (dev) {
+            numClaimedInstances++;
+            instances[i].claimed = TRUE;
+            instances[i].dev = dev;
+        }
+        free(promPath);
     }
 
     DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
@@ -489,29 +521,29 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
      */
     numFound = 0;
     for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {
-	if (!instances[i].claimed)
-	    continue;
-	psdp = instances[i].sbus;
-	if (!xf86CheckSbusSlot(psdp->fbNum))
-	    continue;
-
-	DebugF("%s: card at fb%d %08x is claimed by a Device section\n",
-	       driverName, psdp->fbNum, psdp->node.node);
-
-	/* Allocate an entry in the lists to be returned */
-	numFound++;
-	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
-	retEntities[numFound - 1]
-	    = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,instances[i].dev->active ?
-				TRUE : FALSE);
+        if (!instances[i].claimed)
+            continue;
+        psdp = instances[i].sbus;
+        if (!xf86CheckSbusSlot(psdp->fbNum))
+            continue;
+
+        DebugF("%s: card at fb%d %08x is claimed by a Device section\n",
+               driverName, psdp->fbNum, psdp->node.node);
+
+        /* Allocate an entry in the lists to be returned */
+        numFound++;
+        retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
+        retEntities[numFound - 1]
+            = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,
+                                instances[i].dev->active ? TRUE : FALSE);
     }
     free(instances);
     if (numFound > 0) {
-	*foundEntities = retEntities;
+        *foundEntities = retEntities;
     }
 
     if (useProm)
-	sparcPromClose();
+        sparcPromClose();
 
     return numFound;
 }
@@ -525,12 +557,12 @@ xf86GetSbusInfoForEntity(int entityIndex)
     sbusDevicePtr *psdpp;
     EntityPtr p = xf86Entities[entityIndex];
 
-    if (entityIndex >= xf86NumEntities
-	|| p->bus.type != BUS_SBUS) return NULL;
+    if (entityIndex >= xf86NumEntities || p->bus.type != BUS_SBUS)
+        return NULL;
 
     for (psdpp = xf86SbusInfo; *psdpp != NULL; psdpp++) {
-	if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum)
-	    return *psdpp;
+        if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum)
+            return *psdpp;
     }
     return NULL;
 }
@@ -541,11 +573,13 @@ xf86GetEntityForSbusInfo(sbusDevicePtr psdp)
     int i;
 
     for (i = 0; i < xf86NumEntities; i++) {
-	EntityPtr p = xf86Entities[i];
-	if (p->bus.type != BUS_SBUS) continue;
+        EntityPtr p = xf86Entities[i];
 
-	if (p->bus.id.sbus.fbNum == psdp->fbNum)
-	    return i;
+        if (p->bus.type != BUS_SBUS)
+            continue;
+
+        if (p->bus.id.sbus.fbNum == psdp->fbNum)
+            return i;
     }
     return -1;
 }
@@ -601,32 +635,33 @@ typedef struct _sbusCmap {
 
 static void
 xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-			LOCO *colors, VisualPtr pVisual)
+                        LOCO * colors, VisualPtr pVisual)
 {
     int i, index;
     sbusCmapPtr cmap;
     struct fbcmap fbcmap;
-    unsigned char *data = malloc(numColors*3);
-                             
+    unsigned char *data = malloc(numColors * 3);
+
     cmap = SBUSCMAPPTR(pScrn->pScreen);
-    if (!cmap) return;
+    if (!cmap)
+        return;
     fbcmap.count = 0;
     fbcmap.index = indices[0];
     fbcmap.red = data;
     fbcmap.green = data + numColors;
     fbcmap.blue = fbcmap.green + numColors;
     for (i = 0; i < numColors; i++) {
-	index = indices[i];
-	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
-	    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
-	    fbcmap.count = 0;
-	    fbcmap.index = index;
-	}
-	fbcmap.red[fbcmap.count] = colors[index].red;
-	fbcmap.green[fbcmap.count] = colors[index].green;
-	fbcmap.blue[fbcmap.count++] = colors[index].blue;
+        index = indices[i];
+        if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
+            ioctl(cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+            fbcmap.count = 0;
+            fbcmap.index = index;
+        }
+        fbcmap.red[fbcmap.count] = colors[index].red;
+        fbcmap.green[fbcmap.count] = colors[index].green;
+        fbcmap.blue[fbcmap.count++] = colors[index].blue;
     }
-    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+    ioctl(cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
     free(data);
 }
 
@@ -635,20 +670,20 @@ xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
 {
     sbusCmapPtr cmap;
     struct fbcmap fbcmap;
-                         
+
     cmap = SBUSCMAPPTR(pScreen);
     if (cmap->origCmapValid) {
-	fbcmap.index = 0;
-	fbcmap.count = 16;
-	fbcmap.red = cmap->origRed;
-	fbcmap.green = cmap->origGreen;
-	fbcmap.blue = cmap->origBlue;
-	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+        fbcmap.index = 0;
+        fbcmap.count = 16;
+        fbcmap.red = cmap->origRed;
+        fbcmap.green = cmap->origGreen;
+        fbcmap.blue = cmap->origBlue;
+        ioctl(cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
     }
     pScreen->CloseScreen = cmap->CloseScreen;
     free(cmap);
     return (*pScreen->CloseScreen) (i, pScreen);
-}    
+}
 
 Bool
 xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
@@ -665,25 +700,26 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
     fbcmap.red = cmap->origRed;
     fbcmap.green = cmap->origGreen;
     fbcmap.blue = cmap->origBlue;
-    if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
-	cmap->origCmapValid = TRUE;
+    if (ioctl(psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
+        cmap->origCmapValid = TRUE;
     fbcmap.index = 0;
     fbcmap.count = 2;
     fbcmap.red = data;
     fbcmap.green = data;
     fbcmap.blue = data;
     if (pScreen->whitePixel == 0) {
-	data[0] = 255;
-	data[1] = 0;
-    } else {
-	data[0] = 0;
-	data[1] = 255;
+        data[0] = 255;
+        data[1] = 0;
+    }
+    else {
+        data[0] = 0;
+        data[1] = 255;
     }
-    ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+    ioctl(psdp->fd, FBIOPUTCMAP, &fbcmap);
     cmap->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = xf86SbusCmapCloseScreen;
     return xf86HandleColormaps(pScreen, 256, 8,
-			       xf86SbusCmapLoadPalette, NULL, 0);
+                               xf86SbusCmapLoadPalette, NULL, 0);
 }
 
 Bool
@@ -695,7 +731,7 @@ xf86SbusConfigure(void *busData, sbusDevicePtr sBus)
 }
 
 void
-xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
+xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
 {
     char *promPath = NULL;
 
@@ -708,7 +744,8 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
     if (promPath) {
         XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
         free(promPath);
-    } else {
+    }
+    else {
         XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
     }
 }