From ca1c4c19d688d215b52f4e7e2a634c0cbcfff3c1 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 8 May 2015 13:41:01 +0200 Subject: 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 --- src/smi.h | 4 ++-- src/smi_driver.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/smi.h b/src/smi.h index 9d6671a..e03a0c9 100644 --- a/src/smi.h +++ b/src/smi.h @@ -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); 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(); -- cgit v1.2.3