adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

fbcon: Convert struct font_desc to use ISO C initializers

Browse source 
Akpm's patch "newport_con warning fix" got me to look at the console drivers
again and one thing that I noticed was that none of the fonts was using ISO
initializers for it's fonts.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ralf Baechle 2007-10-16 01:29:03 -07:00 committed by Linus Torvalds
parent ad41b439cc
commit 908633f3ec
10 changed files with 65 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/video/console/font_10x18.c
View file

@ -5133,14 +5133,14 @@ static const unsigned char fontdata_10x18[FONTDATAMAX] = {
const struct font_desc font_10x18 = {
FONT10x18_IDX,
"10x18",
10,
18,
fontdata_10x18,
.idx = FONT10x18_IDX,
.name = "10x18",
.width = 10,
.height = 18,
.data = fontdata_10x18,
#ifdef __sparc__
5
.pref = 5,
#else
-1
.pref = -1,
#endif
};

13
drivers/video/console/font_6x11.c
View file

@ -3342,10 +3342,11 @@ static const unsigned char fontdata_6x11[FONTDATAMAX] = {
const struct font_desc font_vga_6x11 = {
VGA6x11_IDX,
"ProFont6x11",
6,
11,
fontdata_6x11,
-2000 /* Try avoiding this font if possible unless on MAC */
.idx = VGA6x11_IDX,
.name = "ProFont6x11",
.width = 6,
.height = 11,
.data = fontdata_6x11,
/* Try avoiding this font if possible unless on MAC */
.pref = -2000,
};

12
drivers/video/console/font_7x14.c
View file

@ -4109,10 +4109,10 @@ static const unsigned char fontdata_7x14[FONTDATAMAX] = {
const struct font_desc font_7x14 = {
FONT7x14_IDX,
"7x14",
7,
14,
fontdata_7x14,
0
.idx = FONT7x14_IDX,
.name = "7x14",
.width = 7,
.height = 14,
.data = fontdata_7x14,
.pref = 0,
};

12
drivers/video/console/font_8x16.c
View file

@ -4622,10 +4622,10 @@ static const unsigned char fontdata_8x16[FONTDATAMAX] = {
const struct font_desc font_vga_8x16 = {
VGA8x16_IDX,
"VGA8x16",
8,
16,
fontdata_8x16,
0
.idx = VGA8x16_IDX,
.name = "VGA8x16",
.width = 8,
.height = 16,
.data = fontdata_8x16,
.pref = 0,
};

12
drivers/video/console/font_8x8.c
View file

@ -2574,10 +2574,10 @@ static const unsigned char fontdata_8x8[FONTDATAMAX] = {
const struct font_desc font_vga_8x8 = {
VGA8x8_IDX,
"VGA8x8",
8,
8,
fontdata_8x8,
0
.idx = VGA8x8_IDX,
.name = "VGA8x8",
.width = 8,
.height = 8,
.data = fontdata_8x8,
.pref = 0,
};

14
drivers/video/console/font_acorn_8x8.c
View file

@ -262,14 +262,14 @@ static const unsigned char acorndata_8x8[] = {
};
const struct font_desc font_acorn_8x8 = {
ACORN8x8_IDX,
"Acorn8x8",
8,
8,
acorndata_8x8,
.idx = ACORN8x8_IDX,
.name = "Acorn8x8",
.width = 8,
.height = 8,
.data = acorndata_8x8,
#ifdef CONFIG_ARCH_ACORN
20
.pref = 20,
#else
0
.pref = 0,
#endif
};

12
drivers/video/console/font_mini_4x6.c
View file

@ -2148,11 +2148,11 @@ static const unsigned char fontdata_mini_4x6[FONTDATAMAX] = {
};
const struct font_desc font_mini_4x6 = {
MINI4x6_IDX,
"MINI4x6",
4,
6,
fontdata_mini_4x6,
3
.idx = MINI4x6_IDX,
.name = "MINI4x6",
.width = 4,
.height = 6,
.data = fontdata_mini_4x6,
.pref = 3,
};

12
drivers/video/console/font_pearl_8x8.c
View file

@ -2578,10 +2578,10 @@ static const unsigned char fontdata_pearl8x8[FONTDATAMAX] = {
};
const struct font_desc font_pearl_8x8 = {
PEARL8x8_IDX,
"PEARL8x8",
8,
8,
fontdata_pearl8x8,
2
.idx = PEARL8x8_IDX,
.name = "PEARL8x8",
.width = 8,
.height = 8,
.data = fontdata_pearl8x8,
.pref = 2,
};

14
drivers/video/console/font_sun12x22.c
View file

@ -6152,14 +6152,14 @@ static const unsigned char fontdata_sun12x22[FONTDATAMAX] = {
const struct font_desc font_sun_12x22 = {
SUN12x22_IDX,
"SUN12x22",
12,
22,
fontdata_sun12x22,
.idx = SUN12x22_IDX,
.name = "SUN12x22",
.width = 12,
.height = 22,
.data = fontdata_sun12x22,
#ifdef __sparc__
5
.pref = 5,
#else
-1
.pref = -1,
#endif
};

14
drivers/video/console/font_sun8x16.c
View file

@ -262,14 +262,14 @@ static const unsigned char fontdata_sun8x16[FONTDATAMAX] = {
};
const struct font_desc font_sun_8x16 = {
SUN8x16_IDX,
"SUN8x16",
8,
16,
fontdata_sun8x16,
.idx = SUN8x16_IDX,
.name = "SUN8x16",
.width = 8,
.height = 16,
.data = fontdata_sun8x16,
#ifdef __sparc__
10
.pref = 10,
#else
-1
.pref = -1,
#endif
};