Attachment 15859 Details for Bug 14979 – 0001-Compile-warning-fixes.patch

[patch] 0001-Compile-warning-fixes.patch

0001-Compile-warning-fixes.patch (text/plain), 3.15 KB, created by Paulo César Pereira de Andrade on 2008-04-12 17:59:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-04-12 17:59:07 UTC

Size: 3.15 KB

patch

obsolete

>From f554d1bd9817c64e580167990d8561dd59ac6960 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sat, 12 Apr 2008 21:55:49 -0300
>Subject: [PATCH] Compile warning fixes.
>
>  The change to call find_bios_string() using first parameter as
>ps3v instead of ps3v->PciTag seems to fix a genuine bug, but since
>it has been so for so long, it probably is a bug that was never
>properly tested or reproduced.
>
>  Also minor consistency change in pci_rename.h.
>
>  Also rename S3VValidMode() argument index to scrnIndex so that
>driver will compile.
>---
> src/s3v_accel.c     |    2 ++
> src/s3v_driver.c    |    8 +++-----
> src/s3v_pcirename.h |    6 +++---
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/src/s3v_accel.c b/src/s3v_accel.c
>index 528ab8a..66516db 100644
>--- a/src/s3v_accel.c
>+++ b/src/s3v_accel.c
>@@ -37,6 +37,8 @@ in this Software without prior written authorization from the XFree86 Project.
> 
> #include "servermd.h" /* LOG2_BYTES_PER_SCANLINE_PAD */
> 
>+#include <unistd.h>
>+
> static void S3VWriteMask(CARD32*, int);
> 
> static void S3VEngineReset(ScrnInfoPtr pScrn);
>diff --git a/src/s3v_driver.c b/src/s3v_driver.c
>index 9164e42..162c529 100644
>--- a/src/s3v_driver.c
>+++ b/src/s3v_driver.c
>@@ -581,8 +581,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
>     int i;
>     double real;
>     ClockRangePtr clockRanges;
>-    char *mod = NULL;
>-    const char *reqSym = NULL;
>     char *s;
>     
>     unsigned char config1, config2, m, n, n1, n2, cr66 = 0;
>@@ -1232,12 +1230,12 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
>        * Toshiba Tecra 5x0/7x0 seems to use 28.636 MHz
>        * Compaq Armada 7x00 uses 14.318 MHz
>        */
>-      if (find_bios_string(ps3v->PciTag, BIOS_BASE, "COMPAQ M5 BIOS", NULL) != NULL) {
>+      if (find_bios_string(ps3v, BIOS_BASE, "COMPAQ M5 BIOS", NULL) != NULL) {
> 	 if (xf86GetVerbosity())
> 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "COMPAQ M5 BIOS found\n");
> 	 /* ps3v->refclk_fact = 1.0; */
>       }
>-      else if (find_bios_string(ps3v->PciTag, BIOS_BASE, "TOSHIBA Video BIOS", NULL) != NULL) {
>+      else if (find_bios_string(ps3v, BIOS_BASE, "TOSHIBA Video BIOS", NULL) != NULL) {
> 	 if (xf86GetVerbosity())
> 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TOSHIBA Video BIOS found\n");
> 	 /* ps3v->refclk_fact = 2.0; */
>@@ -2671,7 +2669,7 @@ S3VInternalScreenInit( int scrnIndex, ScreenPtr pScreen)
> /* Checks if a mode is suitable for the selected chipset. */
> 
> static ModeStatus
>-S3VValidMode(int index, DisplayModePtr mode, Bool verbose, int flags)
>+S3VValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
> {
>     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
> 
>diff --git a/src/s3v_pcirename.h b/src/s3v_pcirename.h
>index 9321046..1514eca 100644
>--- a/src/s3v_pcirename.h
>+++ b/src/s3v_pcirename.h
>@@ -26,8 +26,8 @@
>  * library. The main purpose being to facilitate source code compatibility.
>  */
> 
>-#ifndef S3PCIRENAME_H
>-#define S3PCIRENAME_H
>+#ifndef S3VPCIRENAME_H
>+#define S3VPCIRENAME_H
> 
> enum region_type {
>     REGION_MEM,
>@@ -119,4 +119,4 @@ typedef struct pci_device *pciVideoPtr;
> 
> #endif /* XSERVER_LIBPCIACCESS */
> 
>-#endif /* CIRPCIRENAME_H */
>+#endif /* S3VPCIRENAME_H */
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 14979: 15073 | 15859 | 17808

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.