diff options
| author | Julien Cristau <jcristau@debian.org> | 2015-05-08 13:41:01 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2015-05-09 16:49:55 +0200 |
| commit | ca1c4c19d688d215b52f4e7e2a634c0cbcfff3c1 (patch) | |
| tree | b77551aaaf52fa9038fe5ac5a2f6ee19e2dc35b0 /src/smi_driver.c | |
| parent | d06454e89384957fa2b77ff35b35108dc657a510 (diff) | |
Fix SwitchMode and AdjustFrame hooks
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>
Diffstat (limited to 'src/smi_driver.c')
| -rw-r--r-- | src/smi_driver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c index 134db79..1c0b355 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -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(); |