frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings in hw/xfree86/os-support/solaris 

sun_init.c: In function `xf86OpenConsole':
sun_init.c:99: warning: cast does not match function type
sun_init.c:74: warning: unused variable `FreeVTslot'
sun_init.c: In function `xf86UseMsg':
sun_init.c:417: warning: old-style parameter declaration

sun_vid.c: In function `solUnMapVidMem':
sun_vid.c:162: warning: long unsigned int format, pointer arg (arg 6)
sun_vid.c: In function `xf86ReadBIOS':
sun_vid.c:217: warning: long unsigned int format, pointer arg (arg 5)
sun_vid.c:217: warning: long unsigned int format, int arg (arg 6)

sun_agp.c: In function `xf86EnableAGP':
sun_agp.c:321: warning: unsigned int format, CARD32 arg (arg 4)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Alan Coopersmith 2010-11-28 13:48:16 -08:00
parent d75777d54c
commit d346bc3083
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/os-support/solaris/sun_agp.c
View File

@ -318,7 +318,7 @@ xf86EnableAGP(int screenNum, CARD32 mode)
if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) { if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {
xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: " xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "
"AGPIOC_SETUP with mode %x failed (%s)\n", "AGPIOC_SETUP with mode %x failed (%s)\n",
mode, strerror(errno)); (unsigned int) mode, strerror(errno));
return FALSE; return FALSE;
} }

7
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -71,7 +71,6 @@ xf86OpenConsole(void)
int fd; int fd;
struct vt_mode VT; struct vt_mode VT;
struct vt_stat vtinfo; struct vt_stat vtinfo;
int FreeVTslot;
MessageType from = X_PROBED; MessageType from = X_PROBED;
#endif #endif
@ -95,8 +94,8 @@ xf86OpenConsole(void)
} }
else else
{ {
if ((int)mmap(0, 0x1000, PROT_NONE, if (mmap(0, 0x1000, PROT_NONE,
MAP_FIXED | MAP_SHARED, fd, 0) == -1) MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)
xf86Msg(X_WARNING, xf86Msg(X_WARNING,
"xf86OpenConsole: failed to protect page 0 (%s)\n", "xf86OpenConsole: failed to protect page 0 (%s)\n",
strerror(errno)); strerror(errno));
@ -413,7 +412,7 @@ xf86ProcessArgument(int argc, char **argv, int i)
return 0; return 0;
} }
void xf86UseMsg() void xf86UseMsg(void)
{ {
#ifdef HAS_USL_VTS #ifdef HAS_USL_VTS
ErrorF("vtX Use the specified VT number\n"); ErrorF("vtX Use the specified VT number\n");

5
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -157,7 +157,7 @@ solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
if (munmap(Base, Size) != 0) { if (munmap(Base, Size) != 0) {
xf86DrvMsgVerb(ScreenNum, X_WARNING, 0, xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
"solUnMapVidMem: failed to unmap %s" "solUnMapVidMem: failed to unmap %s"
" (0x%08lx,0x%lx) (%s)\n", " (0x%p,0x%lx) (%s)\n",
apertureDevName, Base, Size, apertureDevName, Base, Size,
strerror(errno)); strerror(errno));
} }
@ -212,8 +212,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
(void)memcpy(Buf, (void *)(ptr + Offset), Len); (void)memcpy(Buf, (void *)(ptr + Offset), Len);
if (munmap((caddr_t)ptr, mlen) != 0) { if (munmap((caddr_t)ptr, mlen) != 0) {
xf86MsgVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"solUnMapVidMem: failed to unmap %s" "xf86ReadBIOS: failed to unmap %s (0x%p,0x%x) (%s)\n",
" (0x%08lx,0x%lx) (%s)\n",
apertureDevName, ptr, mlen, strerror(errno)); apertureDevName, ptr, mlen, strerror(errno));
} }