Module Name: xsrc
Committed By: mrg
Date: Sat Aug 20 21:15:07 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
xf86sbusBus.c xf86sbusBus.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus: Sbus.c
netbsdSbus.c
Log Message:
fix build issues for sparc64. mostly constification.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.9 Sun Aug 14 01:02:22 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Sat Aug 20 21:15:06 2016
@@ -303,7 +303,7 @@ listPossibleVideoDrivers(char *matches[]
#ifdef __sparc__
if (i < (nmatches - 1))
{
- char *sbusDriver = sparcDriverName();
+ const char *sbusDriver = sparcDriverName();
if (sbusDriver)
matches[i++] = xnfstrdup(sbusDriver);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c:1.6 Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.c Sat Aug 20 21:15:06 2016
@@ -76,7 +76,6 @@ CheckSbusDevice(const char *device, int
psdp->device = xnfstrdup(device);
psdp->width = fbattr.fbtype.fb_width;
psdp->height = fbattr.fbtype.fb_height;
- psdp->size = fbattr.fbtype.fb_size;
psdp->fd = -1;
}
@@ -727,7 +726,7 @@ xf86SbusHandleColormaps(ScreenPtr pScree
if (pScreen->whitePixel == 0) {
data[0] = 255;
data[1] = 0;
- else {
+ } else {
data[0] = 0;
data[1] = 255;
}
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.7 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.8
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h:1.7 Thu Aug 11 00:04:29 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86sbusBus.h Sat Aug 20 21:15:06 2016
@@ -52,7 +52,7 @@ typedef struct sbus_device {
int devId;
int fbNum;
int fd;
- int width, height; // XXXMRG also had size
+ int width, height;
sbusPromNode node;
const char *descr;
const char *device;
@@ -104,7 +104,7 @@ extern _X_EXPORT int sparcPromGetBool(sb
extern _X_EXPORT void sparcPromAssignNodes(void);
extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
-extern _X_EXPORT char *sparcDriverName(void);
+extern _X_EXPORT const char *sparcDriverName(void);
extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c:1.1.1.4 Wed Aug 10 07:44:35 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c Sat Aug 20 21:15:07 2016
@@ -245,7 +245,7 @@ sparcPromGetBool(sbusPromNodePtr pnode,
return promGetBool(prop);
}
-static char *
+static const char *
promWalkGetDriverName(int node, int oldnode)
{
int nextnode;
@@ -275,7 +275,7 @@ promWalkGetDriverName(int node, int oldn
nextnode = promGetChild(node);
if (nextnode) {
- char *name;
+ const char *name;
name = promWalkGetDriverName(nextnode, node);
if (name)
@@ -288,10 +288,10 @@ promWalkGetDriverName(int node, int oldn
return NULL;
}
-char *
+const char *
sparcDriverName(void)
{
- char *name;
+ const char *name;
if (sparcPromInit() < 0)
return NULL;
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.4 Wed Jun 18 16:49:46 2014
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c Sat Aug 20 21:15:07 2016
@@ -462,11 +462,11 @@ sparcPromNode2Pathname(sbusPromNodePtr p
char *ret;
if (!pnode->node) return NULL;
- ret = xalloc(4096);
+ ret = malloc(4096);
if (!ret) return NULL;
if (promWalkNode2Pathname(ret, promRootNode, promGetChild(promRootNode), pnode->node, 0))
return ret;
- xfree(ret);
+ free(ret);
return NULL;
}
@@ -532,7 +532,7 @@ sparcPromPathname2Node(const char *pathN
char *name, *regstr, *p;
i = strlen(pathName);
- name = xalloc(i + 2);
+ name = malloc(i + 2);
if (! name) return 0;
strcpy (name, pathName);
name [i + 1] = 0;
@@ -552,11 +552,11 @@ sparcPromPathname2Node(const char *pathN
return 0;
promGetSibling(0);
i = promWalkPathname2Node(name + 1, regstr, promRootNode, 0);
- xfree(name);
+ free(name);
return i;
}
-static char *
+static const char *
promWalkGetDriverName(int node, int oldnode)
{
int nextnode;
@@ -586,7 +586,7 @@ promWalkGetDriverName(int node, int oldn
nextnode = promGetChild(node);
if (nextnode) {
- char *name;
+ const char *name;
name = promWalkGetDriverName(nextnode, node);
if (name)
return name;
@@ -598,10 +598,10 @@ promWalkGetDriverName(int node, int oldn
return NULL;
}
-char *
+const char *
sparcDriverName(void)
{
- char *name;
+ const char *name;
if (sparcPromInit() < 0)
return NULL;
