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

Warning fix. 

vbe.c: In function ‘VBEReadPanelID’:
vbe.c:1145: warning: return from incompatible pointer type
This commit is contained in:
Adam Jackson 2008-11-25 00:45:07 -05:00
parent 09bfb25e03
commit 81eafe9f93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/vbe/vbe.c
View File

@ -1108,7 +1108,7 @@ VBEReadPanelID(vbeInfoPtr pVbe)
{ {
int RealOff = pVbe->real_mode_base; int RealOff = pVbe->real_mode_base;
pointer page = pVbe->memory; pointer page = pVbe->memory;
unsigned char *tmp = NULL; void *tmp = NULL;
int screen = pVbe->pInt10->scrnIndex; int screen = pVbe->pInt10->scrnIndex;
pVbe->pInt10->ax = 0x4F11; pVbe->pInt10->ax = 0x4F11;
@ -1129,8 +1129,8 @@ VBEReadPanelID(vbeInfoPtr pVbe)
switch (pVbe->pInt10->ax & 0xff00) { switch (pVbe->pInt10->ax & 0xff00) {
case 0x0: case 0x0:
xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read successfully\n"); xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read successfully\n");
tmp = (unsigned char *)xnfalloc(32); tmp = xnfalloc(32);
memcpy(tmp,page,32); memcpy(tmp, page, 32);
break; break;
case 0x100: case 0x100:
xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read failed\n"); xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read failed\n");