reduce diff to upstream

2 files changed, 55 insertions, 903 deletions

diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 073db93dd0d..7f88fccd904 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2015/07/25 04:10:53 markd Exp $
+$NetBSD: distinfo,v 1.63 2015/09/20 15:32:38 tnn Exp $
 
 SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
@@ -10,7 +10,7 @@ SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
 SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
-SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 499e536a1189b88bc17e3df44a9ae2397decdc8b
+SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 74ddd0ce09b8d4426accca5a1a1d25bc6cea6524
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
 SHA1 (patch-os_WaitFor.c) = 6060455bd8d145116b4177c5b0f482cf39c741ea
 SHA1 (patch-os_connection.c) = 19189656fbcabb0a48b68a7606660bda33e5d605
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c
index ebb8f983e6e..fd604e27c07 100644
--- a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bus_Sbus.c
@@ -1,18 +1,10 @@
-$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.1 2015/04/25 11:47:03 tnn Exp $
+$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.2 2015/09/20 15:32:38 tnn Exp $
 
 Merge most of netbsdSbus.c from xsrc.
 
---- hw/xfree86/os-support/bus/Sbus.c.orig	2014-07-30 16:44:59.000000000 +0000
+--- hw/xfree86/os-support/bus/Sbus.c.orig	2015-06-16 13:55:48.000000000 +0000
 +++ hw/xfree86/os-support/bus/Sbus.c
-@@ -20,6 +20,7 @@
-  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
-+/* XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2 2001/10/28 03:34:01 tsi Exp  */
- 
- #ifdef HAVE_XORG_CONFIG_H
- #include <xorg-config.h>
-@@ -34,6 +35,9 @@
+@@ -34,6 +34,9 @@
  #ifdef sun
  #include <sys/utsname.h>
  #endif
@@ -22,52 +14,25 @@ Merge most of netbsdSbus.c from xsrc.
  #include "xf86.h"
  #include "xf86Priv.h"
  #include "xf86_OSlib.h"
-@@ -47,91 +51,103 @@ static int promFd = -1;
- static int promCurrentNode;
- static int promOpenCount = 0;
- static int promP1275 = -1;
--
+@@ -50,7 +53,6 @@ static int promP1275 = -1;
+ 
  #define MAX_PROP	128
  #define MAX_VAL		(4096-128-4)
 -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"},
+@@ -68,68 +70,75 @@ struct sbus_devtable sbusDeviceTable[] =
+     {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 or S24" },
-+    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB" },
-+    { SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D" },
-+    { SBUS_DEVICE_P9100, FBTYPE_P9100, "pnozz", "pnozz", "Weitek P9100" },
-+    { SBUS_DEVICE_AG10E, FBTYPE_AG10E, "ag10e", "ag10e", "Fujitsu AG-10e" },
-+    { 0, 0, NULL }
++    {SBUS_DEVICE_TCX, FBTYPE_TCXCOLOR, "tcx", "suntcx", "Sun TCX or S24"},
+     {SBUS_DEVICE_FFB, FBTYPE_CREATOR, "ffb", "sunffb", "Sun FFB"},
+     {SBUS_DEVICE_FFB, FBTYPE_CREATOR, "afb", "sunffb", "Sun Elite3D"},
++    {SBUS_DEVICE_P9100, FBTYPE_P9100, "pnozz", "pnozz", "Weitek P9100"},
++    {SBUS_DEVICE_AG10E, FBTYPE_AG10E, "ag10e", "ag10e", "Fujitsu AG-10e"},
+     {0, 0, NULL}
  };
  
 +static struct ofiocdesc ofio;
@@ -79,19 +44,14 @@ Merge most of netbsdSbus.c from xsrc.
 -    promOpio->oprom_size = sizeof(int);
  
      if (node == -1)
--        return 0;
+         return 0;
 -    *(int *) promOpio->oprom_array = node;
 -    if (ioctl(promFd, OPROMNEXT, promOpio) < 0)
--        return 0;
++    if (ioctl(promFd, OFIOCGETNEXT, &node) < 0)
+         return 0;
 -    promCurrentNode = *(int *) promOpio->oprom_array;
 -    return *(int *) promOpio->oprom_array;
-+	return 0;
-+
-+    if (ioctl(promFd, OFIOCGETNEXT, &node) < 0)
-+	return 0;
-+
 +    promCurrentNode = node;
-+
 +    return node;
  }
  
@@ -100,21 +60,15 @@ Merge most of netbsdSbus.c from xsrc.
  {
 -    promOpio->oprom_size = sizeof(int);
  
--    if (!node || node == -1)
--        return 0;
+     if (!node || node == -1)
+         return 0;
 -    *(int *) promOpio->oprom_array = node;
 -    if (ioctl(promFd, OPROMCHILD, promOpio) < 0)
--        return 0;
++    if (ioctl(promFd, OFIOCGETCHILD, &node) < 0)
+         return 0;
 -    promCurrentNode = *(int *) promOpio->oprom_array;
 -    return *(int *) promOpio->oprom_array;
-+    if (node == 0 || node == -1)
-+	return 0;
-+
-+    if (ioctl(promFd, OFIOCGETCHILD, &node) < 0)
-+	return 0;
-+
 +    promCurrentNode = node;
-+
 +    return node;
  }
  
@@ -125,7 +79,6 @@ Merge most of netbsdSbus.c from xsrc.
  
 -    strcpy(promOpio->oprom_array, prop);
 -    if (ioctl(promFd, OPROMGETPROP, promOpio) < 0)
--        return 0;
 +    ofio.of_nodeid = promCurrentNode;
 +    ofio.of_name = (char *)prop;
 +    ofio.of_namelen = strlen(prop);
@@ -133,15 +86,14 @@ Merge most of netbsdSbus.c from xsrc.
 +    ofio.of_buflen = sizeof(of_buf);
 +
 +    if (ioctl(promFd, OFIOCGET, &ofio) < 0)
-+	return 0;
+         return 0;
 +
 +    of_buf[ofio.of_buflen] = '\0';
 +
      if (lenp)
 -        *lenp = promOpio->oprom_size;
 -    return promOpio->oprom_array;
-+	*lenp = ofio.of_buflen;
-+
++        *lenp = ofio.of_buflen;
 +    return of_buf;
  }
  
@@ -154,11 +106,6 @@ Merge most of netbsdSbus.c from xsrc.
 +    ofio.of_namelen = strlen(prop);
 +    ofio.of_buf = of_buf;
 +    ofio.of_buflen = sizeof(of_buf);
-+
-+    if (ioctl(promFd, OFIOCGET, &ofio) < 0)
-+	return 0;
-+    if (ofio.of_buflen < 0)
-+	return 0;
  
 -    *(int *) promOpio->oprom_array = 0;
 -    for (;;) {
@@ -170,851 +117,56 @@ Merge most of netbsdSbus.c from xsrc.
 -        if (!strcmp(promOpio->oprom_array, prop))
 -            return 1;
 -    }
++    if (ioctl(promFd, OFIOCGET, &ofio) < 0)
++        return 0;
++    if (ofio.of_buflen < 0)
++        return 0;
 +    return 1;
  }
  
-+
  #define PROM_NODE_SIBLING 0x01
- #define PROM_NODE_PREF    0x02
- #define PROM_NODE_SBUS    0x04
-@@ -144,62 +160,37 @@ 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]);
+@@ -180,8 +189,8 @@ promIsP1275(void)
+         promP1275 = TRUE;
      else
--        node = promGetChild(pnode->cookie[1]);
-+	node = promGetChild(pnode->cookie[1]);
-+
-     if (pnode->node != node)
--        return -1;
-+	return -1;
-+
-     return 0;
- }
- 
-+
- static void
- promIsP1275(void)
- {
--#ifdef linux
--    FILE *f;
--    char buffer[1024];
--
--    if (promP1275 != -1)
--        return;
--    promP1275 = 0;
--    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;
--        }
--    fclose(f);
--#elif defined(sun)
--    struct utsname buffer;
--
--    if ((uname(&buffer) >= 0) && !strcmp(buffer.machine, "sun4u"))
--        promP1275 = TRUE;
--    else
--        promP1275 = FALSE;
+         promP1275 = FALSE;
 -#elif defined(__FreeBSD__)
-     promP1275 = TRUE;
--#else
--#error Missing promIsP1275() function for this OS
--#endif
- }
- 
- void
- sparcPromClose(void)
- {
-     if (promOpenCount > 1) {
--        promOpenCount--;
--        return;
-+	promOpenCount--;
-+	return;
-     }
-     if (promFd != -1) {
--        close(promFd);
--        promFd = -1;
-+	close(promFd);
-+	promFd = -1;
+-    promP1275 = TRUE;
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
++     promP1275 = TRUE;
+ #else
+ #error Missing promIsP1275() function for this OS
+ #endif
+@@ -198,8 +207,6 @@ sparcPromClose(void)
+         close(promFd);
+         promFd = -1;
      }
 -    free(promOpio);
 -    promOpio = NULL;
      promOpenCount = 0;
  }
  
-@@ -207,22 +198,20 @@ int
- sparcPromInit(void)
- {
-     if (promOpenCount) {
--        promOpenCount++;
--        return 0;
-+	promOpenCount++;
-+	return 0;
-     }
-+
+@@ -213,11 +220,6 @@ sparcPromInit(void)
      promFd = open("/dev/openprom", O_RDONLY, 0);
      if (promFd == -1)
--        return -1;
+         return -1;
 -    promOpio = (struct openpromio *) malloc(4096);
 -    if (!promOpio) {
 -        sparcPromClose();
 -        return -1;
 -    }
-+	return -1;
-+
      promRootNode = promGetSibling(0);
      if (!promRootNode) {
--        sparcPromClose();
--        return -1;
-+	sparcPromClose();
-+	return -1;
-     }
-+
-     promIsP1275();
-     promOpenCount++;
- 
-@@ -232,78 +221,23 @@ sparcPromInit(void)
- char *
- sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp)
- {
--    if (promSetNode(pnode))
--        return NULL;
--    return promGetProperty(prop, lenp);
-+     if (promSetNode(pnode))
-+	return NULL;
-+
-+     return promGetProperty(prop, lenp);
- }
- 
- int
- sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
- {
--    if (promSetNode(pnode))
--        return 0;
--    return promGetBool(prop);
--}
--
--static char *
--promWalkGetDriverName(int node, int oldnode)
--{
--    int nextnode;
--    int len;
--    char *prop;
--    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);
--
--    nextnode = promGetChild(node);
--    if (nextnode) {
--        char *name;
--
--        name = promWalkGetDriverName(nextnode, node);
--        if (name)
--            return name;
--    }
--
--    nextnode = promGetSibling(node);
--    if (nextnode)
--        return promWalkGetDriverName(nextnode, node);
--    return NULL;
--}
--
--char *
--sparcDriverName(void)
--{
--    char *name;
-+     if (promSetNode(pnode))
-+	return 0;
- 
--    if (sparcPromInit() < 0)
--        return NULL;
--    promGetSibling(0);
--    name = promWalkGetDriverName(promRootNode, 0);
--    sparcPromClose();
--    return name;
-+     return promGetBool(prop);
- }
- 
- 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;
-@@ -312,72 +246,74 @@ promWalkAssignNodes(int node, int oldnod
-     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
-@@ -387,69 +323,66 @@ sparcPromAssignNodes(void)
-     int n, holes = 0, i, j;
-     FILE *f;
-     sbusDevicePtr devicePtrs[32];
--
--    memset(devicePtrs, 0, sizeof(devicePtrs));
-+    
-+    (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;
+         sparcPromClose();
+@@ -399,9 +401,9 @@ sparcPromAssignNodes(void)
+          * 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 const struct {
-+	    const int devId;
-+	    const 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 *
-@@ -462,43 +395,37 @@ 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))
-+	    sprintf (regstr, "@%x,%x", reg[0], reg[1]);
-+	else if (type == PROM_NODE_PCI) {
-+	    if ((reg[0] >> 8) & 7)
-+		sprintf (regstr, "@%x,%x", (reg[0] >> 11) & 0x1f, (reg[0] >> 8) & 7);
-+	    else
-+		sprintf (regstr, "@%x", (reg[0] >> 11) & 0x1f);
-+	} else if (len == 4)
-+	    sprintf (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;
-+		sprintf (regstr, "@%x,%x", reg[0], regs[1]);
-+	    } else
-+		sprintf (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;
-@@ -507,28 +434,27 @@ promWalkNode2Pathname(char *path, int pa
-     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;
- }
- 
-@@ -537,14 +463,11 @@ sparcPromNode2Pathname(sbusPromNodePtr p
- {
-     char *ret;
- 
--    if (!pnode->node)
--        return NULL;
--    ret = malloc(4096);
--    if (!ret)
--        return NULL;
--    if (promWalkNode2Pathname
--        (ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
--        return ret;
-+    if (!pnode->node) return NULL;
-+    ret = calloc(4096, 1);
-+    if (!ret) return NULL;
-+    if (promWalkNode2Pathname(ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
-+	return ret;
-     free(ret);
-     return NULL;
- }
-@@ -556,52 +479,51 @@ promWalkPathname2Node(char *name, char *
-     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;
-     }
- }
- 
-@@ -612,71 +534,113 @@ sparcPromPathname2Node(const char *pathN
-     char *name, *regstr, *p;
- 
-     i = strlen(pathName);
--    name = malloc(i + 2);
--    if (!name)
--        return 0;
--    strcpy(name, pathName);
--    name[i + 1] = 0;
--    if (name[0] != '/') {
--        free(name);
--        return 0;
--    }
-+    name = calloc(i + 2, 1);
-+    if (! name) return 0;
-+    strcpy (name, pathName);
-+    name [i + 1] = 0;
-+    if (name[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;
--    if (name + 1 == regstr) {
--        free(name);
--        return 0;
--    }
-+	regstr = p;
-+    if (name + 1 == regstr)
-+	return 0;
-     promGetSibling(0);
-     i = promWalkPathname2Node(name + 1, regstr, promRootNode, 0);
-     free(name);
-     return i;
- }
- 
--void *
-+static const char *
-+promWalkGetDriverName(int node, int oldnode)
-+{
-+    int nextnode;
-+    int len;
-+    char *prop;
-+    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);
-+
-+    nextnode = promGetChild(node);
-+    if (nextnode) {
-+	char *name;
-+	name = promWalkGetDriverName(nextnode, node);
-+	if (name)
-+	    return name;
-+    }
-+
-+    nextnode = promGetSibling(node);
-+    if (nextnode)
-+	return promWalkGetDriverName(nextnode, node);
-+    return NULL;
-+}
-+
-+char *
-+sparcDriverName(void)
-+{
-+    char *name;
-+
-+    if (sparcPromInit() < 0)
-+	    return NULL;
-+    promGetSibling(0);
-+    name = promWalkGetDriverName(promRootNode, 0);
-+    sparcPromClose();
-+    return name;
-+}
-+
-+void*
- xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
- {
--    void *ret;
--    unsigned long pagemask = getpagesize() - 1;
--    unsigned long off = offset & ~pagemask;
--    unsigned long len = ((offset + size + pagemask) & ~pagemask) - off;
-+    void* ret;
- 
-     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 = (void *) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
--                         psdp->fd, off);
--    if (ret == (void *) -1) {
--        ret = (void *) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
--                             psdp->fd, off);
-+	psdp->fd = open(psdp->device, O_RDWR);
-+	if (psdp->fd == -1)
-+	    return NULL;
-+    } else if (psdp->fd < 0)
-+	return NULL;
-+
-+    ret = (void*) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
-+			  psdp->fd, offset);
-+    if (ret == (void*) -1) {
-+	ret = (void*) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-+			      psdp->fd, offset);
-     }
--    if (ret == (void *) -1)
--        return NULL;
-+    if (ret == (void*) -1)
-+	return NULL;
- 
--    return (char *) ret + (offset - off);
-+    return ret;
- }
- 
- void
--xf86UnmapSbusMem(sbusDevicePtr psdp, void *addr, unsigned long size)
-+xf86UnmapSbusMem(sbusDevicePtr psdp, void* 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;
--
--    munmap((void *) base, len);
-+    munmap (addr, size);
- }
- 
- /* Tell OS that we are driving the HW cursor ourselves. */
-@@ -692,8 +656,8 @@ xf86SbusHideOsHwCursor(sbusDevicePtr psd
-     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;
++        static const struct {
++            const int devId;
++            const char *prefix;
+         } procFbPrefixes[] = {
+             {SBUS_DEVICE_BW2, "BWtwo"},
+             {SBUS_DEVICE_CG14, "CGfourteen"},