From this patch on, I will ignore the "generated by default"
sparse warning:
"Using plain integer as NULL pointer"
that is, add -Wno-non-pointer-null to sparse (cgcc) command line.
>From 3f88e53d1db44b12d15f01c04a539580cb876fc0 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Thu, 5 Feb 2009 18:58:13 -0200
Subject: [PATCH 2/2] Janitor: Correct compiler warnings.
Most of the warnings were generated by sparse. The symbols
DAC_TEXT and DAC_EGA were removed because they are not used
anywhere.
Signed-off-by: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
---
src/ast_accel.c | 4 +-
src/ast_driver.c | 14 ++++++------
src/ast_mode.c | 56 ++++++++--------------------------------------------
src/ast_vgatool.c | 6 ++--
4 files changed, 21 insertions(+), 59 deletions(-)
diff --git a/src/ast_accel.c b/src/ast_accel.c
index ad954e8..1086184 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -58,7 +58,7 @@
#ifdef Accel_2D
/* ROP Translation Table */
-int ASTXAACopyROP[16] =
+static int ASTXAACopyROP[16] =
{
ROP_0, /* GXclear */
ROP_DSa, /* GXand */
@@ -78,7 +78,7 @@ int ASTXAACopyROP[16] =
ROP_1 /* GXset */
};
-int ASTXAAPatternROP[16]=
+static int ASTXAAPatternROP[16]=
{
ROP_0,
ROP_DPa,
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 920987b..2ec2cb2 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -158,7 +158,7 @@ static const OptionInfoRec ASTOptions[] = {
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
-const char *vgahwSymbols[] = {
+static const char *vgahwSymbols[] = {
"vgaHWFreeHWRec",
"vgaHWGetHWRec",
"vgaHWGetIOBase",
@@ -176,13 +176,13 @@ const char *vgahwSymbols[] = {
NULL
};
-const char *fbSymbols[] = {
+static const char *fbSymbols[] = {
"fbPictureInit",
"fbScreenInit",
NULL
};
-const char *vbeSymbols[] = {
+static const char *vbeSymbols[] = {
"VBEInit",
"VBEFreeModeInfo",
"VBEFreeVBEInfo",
@@ -213,13 +213,13 @@ static const char *vbeOptionalSymbols[] = {
};
#endif
-const char *ddcSymbols[] = {
+static const char *ddcSymbols[] = {
"xf86PrintEDID",
"xf86SetDDCproperties",
NULL
};
-const char *int10Symbols[] = {
+static const char *int10Symbols[] = {
"xf86ExecX86int10",
"xf86InitInt10",
"xf86Int10AllocPages",
@@ -228,7 +228,7 @@ const char *int10Symbols[] = {
NULL
};
-const char *xaaSymbols[] = {
+static const char *xaaSymbols[] = {
"XAACreateInfoRec",
"XAADestroyInfoRec",
"XAAInit",
@@ -237,7 +237,7 @@ const char *xaaSymbols[] = {
NULL
};
-const char *ramdacSymbols[] = {
+static const char *ramdacSymbols[] = {
"xf86CreateCursorInfoRec",
"xf86DestroyCursorInfoRec",
"xf86InitCursor",
diff --git a/src/ast_mode.c b/src/ast_mode.c
index 60cd1fd..ffc7ee0 100644
--- a/src/ast_mode.c
+++ b/src/ast_mode.c
@@ -56,7 +56,7 @@
/* Driver specific headers */
#include "ast.h"
-VBIOS_STDTABLE_STRUCT StdTable[] = {
+static VBIOS_STDTABLE_STRUCT StdTable[] = {
/* MD_2_3_400 */
{
0x67,
@@ -129,7 +129,7 @@ VBIOS_STDTABLE_STRUCT StdTable[] = {
},
};
-VBIOS_ENHTABLE_STRUCT Res640x480Table[] = {
+static VBIOS_ENHTABLE_STRUCT Res640x480Table[] = {
{ 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175, /* 60Hz */
(SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E },
{ 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5, /* 72Hz */
@@ -143,7 +143,7 @@ VBIOS_ENHTABLE_STRUCT Res640x480Table[] = {
};
-VBIOS_ENHTABLE_STRUCT Res800x600Table[] = {
+static VBIOS_ENHTABLE_STRUCT Res800x600Table[] = {
{1024, 800, 24, 72, 625, 600, 1, 2, VCLK36, /* 56Hz */
(SyncPP | Charx8Dot), 56, 1, 0x30 },
{1056, 800, 40, 128, 628, 600, 1, 4, VCLK40, /* 60Hz */
@@ -159,7 +159,7 @@ VBIOS_ENHTABLE_STRUCT Res800x600Table[] = {
};
-VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = {
+static VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = {
{1344, 1024, 24, 136, 806, 768, 3, 6, VCLK65, /* 60Hz */
(SyncNN | Charx8Dot), 60, 1, 0x31 },
{1328, 1024, 24, 136, 806, 768, 3, 6, VCLK75, /* 70Hz */
@@ -172,7 +172,7 @@ VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = {
(SyncPP | Charx8Dot), 0xFF, 4, 0x31 },
};
-VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = {
+static VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = {
{1688, 1280, 48, 112, 1066, 1024, 1, 3, VCLK108, /* 60Hz */
(SyncPP | Charx8Dot), 60, 1, 0x32 },
{1688, 1280, 16, 144, 1066, 1024, 1, 3, VCLK135, /* 75Hz */
@@ -183,21 +183,21 @@ VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = {
(SyncPP | Charx8Dot), 0xFF, 3, 0x32 },
};
-VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = {
+static VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = {
{2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* 60Hz */
(SyncPP | Charx8Dot), 60, 1, 0x33 },
{2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* end */
(SyncPP | Charx8Dot), 0xFF, 1, 0x33 },
};
-VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = {
+static VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = {
{2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */
(SyncNP | Charx8Dot), 60, 1, 0x34 },
{2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */
(SyncNP | Charx8Dot), 0xFF, 1, 0x34 },
};
-VBIOS_DCLK_INFO DCLKTable [] = {
+static VBIOS_DCLK_INFO DCLKTable [] = {
{0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */
{0x95, 0x62, 0x03}, /* 01: VCLK28_322 */
{0x67, 0x63, 0x01}, /* 02: VCLK31_5 */
@@ -217,45 +217,7 @@ VBIOS_DCLK_INFO DCLKTable [] = {
{0x4d, 0x4c, 0x80}, /* 10: VCLK193_25 */
};
-VBIOS_DAC_INFO DAC_TEXT[] = {
- { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a },
- { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a },
- { 0x00, 0x00, 0x15 }, { 0x00, 0x00, 0x3f }, { 0x00, 0x2a, 0x15 }, { 0x00, 0x2a, 0x3f },
- { 0x2a, 0x00, 0x15 }, { 0x2a, 0x00, 0x3f }, { 0x2a, 0x2a, 0x15 }, { 0x2a, 0x2a, 0x3f },
- { 0x00, 0x15, 0x00 }, { 0x00, 0x15, 0x2a }, { 0x00, 0x3f, 0x00 }, { 0x00, 0x3f, 0x2a },
- { 0x2a, 0x15, 0x00 }, { 0x2a, 0x15, 0x2a }, { 0x2a, 0x3f, 0x00 }, { 0x2a, 0x3f, 0x2a },
- { 0x00, 0x15, 0x15 }, { 0x00, 0x15, 0x3f }, { 0x00, 0x3f, 0x15 }, { 0x00, 0x3f, 0x3f },
- { 0x2a, 0x15, 0x15 }, { 0x2a, 0x15, 0x3f }, { 0x2a, 0x3f, 0x15 }, { 0x2a, 0x3f, 0x3f },
- { 0x15, 0x00, 0x00 }, { 0x15, 0x00, 0x2a }, { 0x15, 0x2a, 0x00 }, { 0x15, 0x2a, 0x2a },
- { 0x3f, 0x00, 0x00 }, { 0x3f, 0x00, 0x2a }, { 0x3f, 0x2a, 0x00 }, { 0x3f, 0x2a, 0x2a },
- { 0x15, 0x00, 0x15 }, { 0x15, 0x00, 0x3f }, { 0x15, 0x2a, 0x15 }, { 0x15, 0x2a, 0x3f },
- { 0x3f, 0x00, 0x15 }, { 0x3f, 0x00, 0x3f }, { 0x3f, 0x2a, 0x15 }, { 0x3f, 0x2a, 0x3f },
- { 0x15, 0x15, 0x00 }, { 0x15, 0x15, 0x2a }, { 0x15, 0x3f, 0x00 }, { 0x15, 0x3f, 0x2a },
- { 0x3f, 0x15, 0x00 }, { 0x3f, 0x15, 0x2a }, { 0x3f, 0x3f, 0x00 }, { 0x3f, 0x3f, 0x2a },
- { 0x15, 0x15, 0x15 }, { 0x15, 0x15, 0x3f }, { 0x15, 0x3f, 0x15 }, { 0x15, 0x3f, 0x3f },
- { 0x3f, 0x15, 0x15 }, { 0x3f, 0x15, 0x3f }, { 0x3f, 0x3f, 0x15 }, { 0x3f, 0x3f, 0x3f },
-};
-
-VBIOS_DAC_INFO DAC_EGA[] = {
- { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a },
- { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a },
- { 0x00, 0x00, 0x15 }, { 0x00, 0x00, 0x3f }, { 0x00, 0x2a, 0x15 }, { 0x00, 0x2a, 0x3f },
- { 0x2a, 0x00, 0x15 }, { 0x2a, 0x00, 0x3f }, { 0x2a, 0x2a, 0x15 }, { 0x2a, 0x2a, 0x3f },
- { 0x00, 0x15, 0x00 }, { 0x00, 0x15, 0x2a }, { 0x00, 0x3f, 0x00 }, { 0x00, 0x3f, 0x2a },
- { 0x2a, 0x15, 0x00 }, { 0x2a, 0x15, 0x2a }, { 0x2a, 0x3f, 0x00 }, { 0x2a, 0x3f, 0x2a },
- { 0x00, 0x15, 0x15 }, { 0x00, 0x15, 0x3f }, { 0x00, 0x3f, 0x15 }, { 0x00, 0x3f, 0x3f },
- { 0x2a, 0x15, 0x15 }, { 0x2a, 0x15, 0x3f }, { 0x2a, 0x3f, 0x15 }, { 0x2a, 0x3f, 0x3f },
- { 0x15, 0x00, 0x00 }, { 0x15, 0x00, 0x2a }, { 0x15, 0x2a, 0x00 }, { 0x15, 0x2a, 0x2a },
- { 0x3f, 0x00, 0x00 }, { 0x3f, 0x00, 0x2a }, { 0x3f, 0x2a, 0x00 }, { 0x3f, 0x2a, 0x2a },
- { 0x15, 0x00, 0x15 }, { 0x15, 0x00, 0x3f }, { 0x15, 0x2a, 0x15 }, { 0x15, 0x2a, 0x3f },
- { 0x3f, 0x00, 0x15 }, { 0x3f, 0x00, 0x3f }, { 0x3f, 0x2a, 0x15 }, { 0x3f, 0x2a, 0x3f },
- { 0x15, 0x15, 0x00 }, { 0x15, 0x15, 0x2a }, { 0x15, 0x3f, 0x00 }, { 0x15, 0x3f, 0x2a },
- { 0x3f, 0x15, 0x00 }, { 0x3f, 0x15, 0x2a }, { 0x3f, 0x3f, 0x00 }, { 0x3f, 0x3f, 0x2a },
- { 0x15, 0x15, 0x15 }, { 0x15, 0x15, 0x3f }, { 0x15, 0x3f, 0x15 }, { 0x15, 0x3f, 0x3f },
- { 0x3f, 0x15, 0x15 }, { 0x3f, 0x15, 0x3f }, { 0x3f, 0x3f, 0x15 }, { 0x3f, 0x3f, 0x3f },
-};
-
-VBIOS_DAC_INFO DAC_VGA[] = {
+static VBIOS_DAC_INFO DAC_VGA[] = {
{ 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a },
{ 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x15, 0x00 }, { 0x2a, 0x2a, 0x2a },
{ 0x15, 0x15, 0x15 }, { 0x15, 0x15, 0x3f }, { 0x15, 0x3f, 0x15 }, { 0x15, 0x3f, 0x3f },
diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
index 9990cda..336b033 100644
--- a/src/ast_vgatool.c
+++ b/src/ast_vgatool.c
@@ -481,7 +481,7 @@ typedef struct _AST_DRAMStruct {
} AST_DRAMStruct, *PAST_DRAMStruct;
-AST_DRAMStruct AST2000DRAMTableData[] = {
+static AST_DRAMStruct AST2000DRAMTableData[] = {
{ 0x0108, 0x00000000 },
{ 0x0120, 0x00004a21 },
{ 0xFF00, 0x00000043 },
@@ -509,7 +509,7 @@ AST_DRAMStruct AST2000DRAMTableData[] = {
{ 0xFFFF, 0xFFFFFFFF }
};
-AST_DRAMStruct AST1100DRAMTableData[] = {
+static AST_DRAMStruct AST1100DRAMTableData[] = {
{ 0x2000, 0x1688a8a8 },
{ 0x2020, 0x000041f0 },
{ 0xFF00, 0x00000043 },
@@ -562,7 +562,7 @@ AST_DRAMStruct AST1100DRAMTableData[] = {
{ 0xffff, 0xffffffff },
};
-AST_DRAMStruct AST2100DRAMTableData[] = {
+static AST_DRAMStruct AST2100DRAMTableData[] = {
{ 0x2000, 0x1688a8a8 },
{ 0x2020, 0x00004120 },
{ 0xFF00, 0x00000043 },
--
1.6.1
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
