diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-07-17 18:54:17 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-07-28 19:22:49 -0300 |
| commit | 565c1ad65277080968c188a635dfd743be7ea2a3 (patch) | |
| tree | 11b5330b02159da05e52bf4790900016544ef241 | |
| parent | 2128de2ad9fa67537d8ed56ff173b8a7b0422e0e (diff) | |
Correct unresolved symbol and incorrect assignment.
Function miPointerPosition is deprecated and not available anymore.
Correct "if (test = value)" -> "if (test == value)".
| -rw-r--r-- | src/s3_driver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/s3_driver.c b/src/s3_driver.c index 797e0b3..86b336c 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -1186,12 +1186,13 @@ static int S3GetPixMuxShift(ScrnInfoPtr pScrn) shift = 1; /* XXX IBMRGB */ else if (pS3->Chipset == PCI_CHIP_TRIO || pS3->Chipset == PCI_CHIP_TRIO64UVP || - pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX) + pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX) { if (pS3->s3Bpp == 2) shift = -1; else shift = 0; - + } + return shift; } @@ -1220,7 +1221,7 @@ static Bool S3ModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) Set correct blanking for S3 Trio64V2. It's also needed to clear cr33_5. */ - if (pS3->Chipset = PCI_CHIP_TRIO64V2_DXGX) + if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX) mode->CrtcHBlankStart = mode->CrtcHDisplay + 8; if ((mode->HTotal == mode->CrtcHTotal) && (pS3->pixMuxShift != 0)) { @@ -1903,7 +1904,7 @@ static void S3AdjustFrame(int scrnIndex, int x, int y, int flags) { int px, py, a; - miPointerPosition(&px, &py); + miPointerGetPosition(inputInfo.pointer, &px, &py); if (pS3->s3Bpp == 1) a = 4 - 1; |