XLibre/xf86-video-siliconmotion
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-siliconmotion.git synced 2026-03-24 01:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SwitchMode and AdjustFrame hooks

Browse Source 
smi_driver.c: In function 'SMI_Probe':
smi_driver.c:360:24: warning: assignment from incompatible pointer type
   pScrn->SwitchMode    = SMI_SwitchMode;
                        ^
smi_driver.c:361:24: warning: assignment from incompatible pointer type
   pScrn->AdjustFrame   = SMI_AdjustFrame;
                        ^

Signed-off-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Julien Cristau
2015-05-08 13:41:01 +02:00
parent d06454e893
commit ca1c4c19d6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/smi.h
View File

@@ -390,8 +390,8 @@ Bool SMI_HWCursorInit(ScreenPtr pScrn);
/* smi_driver.c */
Bool SMI_MapMem(ScrnInfoPtr pScrn);
void SMI_UnmapMem(ScrnInfoPtr pScrn);
void SMI_AdjustFrame(int scrnIndex, int x, int y, int flags);
Bool SMI_SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
void SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL);
Bool SMI_SwitchMode(SWITCH_MODE_ARGS_DECL);
void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
LOCO *colors, VisualPtr pVisual);
xf86MonPtr SMI_ddc1(ScrnInfoPtr pScrn);

9
src/smi_driver.c
View File

@@ -1899,9 +1899,10 @@ SMI_SaveScreen(ScreenPtr pScreen, int mode)
}
void
SMI_AdjustFrame(int scrnIndex, int x, int y, int flags)
SMI_AdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(xf86Screens[scrnIndex]);
SCRN_INFO_PTR(arg);
xf86CrtcConfigPtr crtcConf = XF86_CRTC_CONFIG_PTR(pScrn);
xf86CrtcPtr compat_crtc = crtcConf->output[crtcConf->compat_output]->crtc;
ENTER();
@@ -1912,10 +1913,10 @@ SMI_AdjustFrame(int scrnIndex, int x, int y, int flags)
}
Bool
SMI_SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
SMI_SwitchMode(SWITCH_MODE_ARGS_DECL)
{
Bool ret;
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SCRN_INFO_PTR(arg);
SMIPtr pSmi = SMIPTR(pScrn);
ENTER();