Attachment 17732 Details for Bug 15042 – 0001--Correct-unresolved-symbol-and-incorrect-assignment.patch

[patch] 0001--Correct-unresolved-symbol-and-incorrect-assignment.patch

0001--Correct-unresolved-symbol-and-incorrect-assignment.patch (text/plain), 1.57 KB, created by Paulo César Pereira de Andrade on 2008-07-17 15:28:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-07-17 15:28:32 UTC

Size: 1.57 KB

patch

obsolete

>From 373bd0baef3f7b8e3dbfbf6da489a50fe40e5285 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Thu, 17 Jul 2008 18:54:17 -0300
>Subject: [PATCH]   Correct unresolved symbol and incorrect assignment.
>
>  Function miPointerPosition is deprecated and not available anymore.
>  Correct "if (test = value)" -> "if (test == value)".
>---
> 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;
>-- 
>1.5.6
>

Actions: View | Splinter Review

Attachments on bug 15042: 15161 | 17732

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.