diff options
Diffstat (limited to 'driver/xf86-video-sis/src/sis_utility.c')
| -rw-r--r-- | driver/xf86-video-sis/src/sis_utility.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/driver/xf86-video-sis/src/sis_utility.c b/driver/xf86-video-sis/src/sis_utility.c index eda194fad..dc083fd99 100644 --- a/driver/xf86-video-sis/src/sis_utility.c +++ b/driver/xf86-video-sis/src/sis_utility.c @@ -266,7 +266,7 @@ extern UShort SiS_CheckModeCRT1(ScrnInfoPtr pScrn, DisplayModePtr mode, unsigned int VBFlags, Bool hcm); extern UShort SiS_CheckModeCRT2(ScrnInfoPtr pScrn, DisplayModePtr mode, unsigned int VBFlags, Bool hcm); -extern void SISAdjustFrame(int scrnIndex, int x, int y, int flags); +extern void SISAdjustFrame(ADJUST_FRAME_ARGS_DECL); extern float SiSCalcVRate(DisplayModePtr mode); extern void SiS_UpdateGammaCRT2(ScrnInfoPtr pScrn); #ifdef SISGAMMARAMP @@ -401,12 +401,12 @@ SISSwitchCRT1Status(ScrnInfoPtr pScrn, int onoff, Bool quiet) (*pSiS->SyncAccel)(pScrn); pSiS->skipswitchcheck = TRUE; - if(!(pScrn->SwitchMode(pScrn->scrnIndex, pScrn->currentMode, 0))) { + if(!(pScrn->SwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)))) { pSiS->skipswitchcheck = FALSE; return FALSE; } pSiS->skipswitchcheck = FALSE; - SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + SISAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); return TRUE; } @@ -431,12 +431,12 @@ SISRedetectCRT2Devices(ScrnInfoPtr pScrn) /* Sync the accelerators */ (*pSiS->SyncAccel)(pScrn); pSiS->skipswitchcheck = TRUE; - if(!(pScrn->SwitchMode(pScrn->scrnIndex, pScrn->currentMode, 0))) { + if(!(pScrn->SwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)))) { pSiS->skipswitchcheck = FALSE; return FALSE; } pSiS->skipswitchcheck = FALSE; - SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + SISAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); } return TRUE; } @@ -561,12 +561,12 @@ SISSwitchCRT2Type(ScrnInfoPtr pScrn, ULong newvbflags, Bool quiet) pSiS->VBFlags = pSiS->VBFlags_backup = newvbflags; pSiS->skipswitchcheck = TRUE; - if(!(pScrn->SwitchMode(pScrn->scrnIndex, pScrn->currentMode, 0))) { + if(!(pScrn->SwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)))) { pSiS->skipswitchcheck = FALSE; return FALSE; } pSiS->skipswitchcheck = FALSE; - SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + SISAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); return TRUE; } @@ -866,7 +866,7 @@ sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, char *mystring) static int SiSHandleSiSDirectCommand(xSiSCtrlCommandReply *sdcbuf) { - ScrnInfoPtr pScrn = xf86Screens[sdcbuf->screen]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(screenInfo.screens[sdcbuf->screen]); SISPtr pSiS = SISPTR(pScrn); #ifdef SISDUALHEAD SISEntPtr pSiSEnt = pSiS->entityPrivate; |