C99 initializers for drivers/video
PATCH 1/1 C99 initializers for drivers/video
Hi.
Here's a set of patches switching drivers/video to use C99 initializers. The patches are against 2.5.49.
Art Haas
drivers/video/aty128fb.c renamed from drivers/video/aty128fb.c.old +32 -32
@@ -2397,14 +2397,14 @@ }static struct display_switch fbcon_aty128_8 = { - setup: fbcon_cfb8_setup, - bmove: fbcon_aty128_bmove, - clear: fbcon_cfb8_clear, - putc: fbcon_aty8_putc, - putcs: fbcon_aty8_putcs, - revc: fbcon_cfb8_revc, - clear_margins: fbcon_aty8_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb8_setup, + .bmove = fbcon_aty128_bmove, + .clear = fbcon_cfb8_clear, + .putc = fbcon_aty8_putc, + .putcs = fbcon_aty8_putcs, + .revc = fbcon_cfb8_revc, + .clear_margins = fbcon_aty8_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };#endif #ifdef FBCON_HAS_CFB16
@@ -2445,14 +2445,14 @@ }static struct display_switch fbcon_aty128_16 = { - setup: fbcon_cfb16_setup, - bmove: fbcon_aty128_bmove, - clear: fbcon_cfb16_clear, - putc: fbcon_aty16_putc, - putcs: fbcon_aty16_putcs, - revc: fbcon_cfb16_revc, - clear_margins: fbcon_aty16_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb16_setup, + .bmove = fbcon_aty128_bmove, + .clear = fbcon_cfb16_clear, + .putc = fbcon_aty16_putc, + .putcs = fbcon_aty16_putcs, + .revc = fbcon_cfb16_revc, + .clear_margins = fbcon_aty16_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };#endif #ifdef FBCON_HAS_CFB24
@@ -2493,14 +2493,14 @@ }static struct display_switch fbcon_aty128_24 = { - setup: fbcon_cfb24_setup, - bmove: fbcon_aty128_bmove, - clear: fbcon_cfb24_clear, - putc: fbcon_aty24_putc, - putcs: fbcon_aty24_putcs, - revc: fbcon_cfb24_revc, - clear_margins: fbcon_aty24_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb24_setup, + .bmove = fbcon_aty128_bmove, + .clear = fbcon_cfb24_clear, + .putc = fbcon_aty24_putc, + .putcs = fbcon_aty24_putcs, + .revc = fbcon_cfb24_revc, + .clear_margins = fbcon_aty24_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };#endif #ifdef FBCON_HAS_CFB32
@@ -2541,14 +2541,14 @@ }static struct display_switch fbcon_aty128_32 = { - setup: fbcon_cfb32_setup, - bmove: fbcon_aty128_bmove, - clear: fbcon_cfb32_clear, - putc: fbcon_aty32_putc, - putcs: fbcon_aty32_putcs, - revc: fbcon_cfb32_revc, - clear_margins: fbcon_aty32_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb32_setup, + .bmove = fbcon_aty128_bmove, + .clear = fbcon_cfb32_clear, + .putc = fbcon_aty32_putc, + .putcs = fbcon_aty32_putcs, + .revc = fbcon_cfb32_revc, + .clear_margins = fbcon_aty32_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };#endif
drivers/video/controlfb.c renamed from drivers/video/controlfb.c.old +16 -16
@@ -1264,25 +1264,25 @@ }static struct display_switch control_cfb16 = { - setup: fbcon_cfb16_setup, - bmove: fbcon_cfb16_bmove, - clear: fbcon_cfb16_clear, - putc: fbcon_cfb16_putc, - putcs: fbcon_cfb16_putcs, - revc: control_cfb16_revc, - clear_margins: fbcon_cfb16_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb16_setup, + .bmove = fbcon_cfb16_bmove, + .clear = fbcon_cfb16_clear, + .putc = fbcon_cfb16_putc, + .putcs = fbcon_cfb16_putcs, + .revc = control_cfb16_revc, + .clear_margins = fbcon_cfb16_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };static struct display_switch control_cfb32 = { - setup: fbcon_cfb32_setup, - bmove: fbcon_cfb32_bmove, - clear: fbcon_cfb32_clear, - putc: fbcon_cfb32_putc, - putcs: fbcon_cfb32_putcs, - revc: control_cfb32_revc, - clear_margins: fbcon_cfb32_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb32_setup, + .bmove = fbcon_cfb32_bmove, + .clear = fbcon_cfb32_clear, + .putc = fbcon_cfb32_putc, + .putcs = fbcon_cfb32_putcs, + .revc = control_cfb32_revc, + .clear_margins = fbcon_cfb32_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };
drivers/video/fbcon-afb.c renamed from drivers/video/fbcon-afb.c.old +7 -7
@@ -412,13 +412,13 @@*/ struct display_switch fbcon_afb = { - setup: fbcon_afb_setup, - bmove: fbcon_afb_bmove, - clear: fbcon_afb_clear, - putc: fbcon_afb_putc, - putcs: fbcon_afb_putcs, - revc: fbcon_afb_revc, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_afb_setup, + .bmove = fbcon_afb_bmove, + .clear = fbcon_afb_clear, + .putc = fbcon_afb_putc, + .putcs = fbcon_afb_putcs, + .revc = fbcon_afb_revc, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-cfb16.c renamed from drivers/video/fbcon-cfb16.c.old +8 -8
@@ -281,14 +281,14 @@*/ struct display_switch fbcon_cfb16 = { - setup: fbcon_cfb16_setup, - bmove: fbcon_cfb16_bmove, - clear: fbcon_cfb16_clear, - putc: fbcon_cfb16_putc, - putcs: fbcon_cfb16_putcs, - revc: fbcon_cfb16_revc, - clear_margins: fbcon_cfb16_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb16_setup, + .bmove = fbcon_cfb16_bmove, + .clear = fbcon_cfb16_clear, + .putc = fbcon_cfb16_putc, + .putcs = fbcon_cfb16_putcs, + .revc = fbcon_cfb16_revc, + .clear_margins = fbcon_cfb16_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };
drivers/video/fbcon-cfb2.c renamed from drivers/video/fbcon-cfb2.c.old +7 -7
@@ -189,13 +189,13 @@*/ struct display_switch fbcon_cfb2 = { - setup: fbcon_cfb2_setup, - bmove: fbcon_cfb2_bmove, - clear: fbcon_cfb2_clear, - putc: fbcon_cfb2_putc, - putcs: fbcon_cfb2_putcs, - revc: fbcon_cfb2_revc, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_cfb2_setup, + .bmove = fbcon_cfb2_bmove, + .clear = fbcon_cfb2_clear, + .putc = fbcon_cfb2_putc, + .putcs = fbcon_cfb2_putcs, + .revc = fbcon_cfb2_revc, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-cfb24.c renamed from drivers/video/fbcon-cfb24.c.old +8 -8
@@ -295,14 +295,14 @@*/ struct display_switch fbcon_cfb24 = { - setup: fbcon_cfb24_setup, - bmove: fbcon_cfb24_bmove, - clear: fbcon_cfb24_clear, - putc: fbcon_cfb24_putc, - putcs: fbcon_cfb24_putcs, - revc: fbcon_cfb24_revc, - clear_margins: fbcon_cfb24_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb24_setup, + .bmove = fbcon_cfb24_bmove, + .clear = fbcon_cfb24_clear, + .putc = fbcon_cfb24_putc, + .putcs = fbcon_cfb24_putcs, + .revc = fbcon_cfb24_revc, + .clear_margins = fbcon_cfb24_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };
drivers/video/fbcon-cfb32.c renamed from drivers/video/fbcon-cfb32.c.old +8 -8
@@ -267,14 +267,14 @@*/ struct display_switch fbcon_cfb32 = { - setup: fbcon_cfb32_setup, - bmove: fbcon_cfb32_bmove, - clear: fbcon_cfb32_clear, - putc: fbcon_cfb32_putc, - putcs: fbcon_cfb32_putcs, - revc: fbcon_cfb32_revc, - clear_margins: fbcon_cfb32_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb32_setup, + .bmove = fbcon_cfb32_bmove, + .clear = fbcon_cfb32_clear, + .putc = fbcon_cfb32_putc, + .putcs = fbcon_cfb32_putcs, + .revc = fbcon_cfb32_revc, + .clear_margins = fbcon_cfb32_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };
drivers/video/fbcon-cfb4.c renamed from drivers/video/fbcon-cfb4.c.old +7 -7
@@ -193,13 +193,13 @@*/ struct display_switch fbcon_cfb4 = { - setup: fbcon_cfb4_setup, - bmove: fbcon_cfb4_bmove, - clear: fbcon_cfb4_clear, - putc: fbcon_cfb4_putc, - putcs: fbcon_cfb4_putcs, - revc: fbcon_cfb4_revc, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_cfb4_setup, + .bmove = fbcon_cfb4_bmove, + .clear = fbcon_cfb4_clear, + .putc = fbcon_cfb4_putc, + .putcs = fbcon_cfb4_putcs, + .revc = fbcon_cfb4_revc, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-cfb8.c renamed from drivers/video/fbcon-cfb8.c.old +8 -8
@@ -256,14 +256,14 @@*/ struct display_switch fbcon_cfb8 = { - setup: fbcon_cfb8_setup, - bmove: fbcon_cfb8_bmove, - clear: fbcon_cfb8_clear, - putc: fbcon_cfb8_putc, - putcs: fbcon_cfb8_putcs, - revc: fbcon_cfb8_revc, - clear_margins: fbcon_cfb8_clear_margins, - fontwidthmask:FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) + .setup = fbcon_cfb8_setup, + .bmove = fbcon_cfb8_bmove, + .clear = fbcon_cfb8_clear, + .putc = fbcon_cfb8_putc, + .putcs = fbcon_cfb8_putcs, + .revc = fbcon_cfb8_revc, + .clear_margins = fbcon_cfb8_clear_margins, + .fontwidthmask =FONTWIDTH (4 )|FONTWIDTH (8 )|FONTWIDTH (12 )|FONTWIDTH (16 ) };
drivers/video/fbcon-ilbm.c renamed from drivers/video/fbcon-ilbm.c.old +7 -7
@@ -260,13 +260,13 @@*/ struct display_switch fbcon_ilbm = { - setup: fbcon_ilbm_setup, - bmove: fbcon_ilbm_bmove, - clear: fbcon_ilbm_clear, - putc: fbcon_ilbm_putc, - putcs: fbcon_ilbm_putcs, - revc: fbcon_ilbm_revc, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_ilbm_setup, + .bmove = fbcon_ilbm_bmove, + .clear = fbcon_ilbm_clear, + .putc = fbcon_ilbm_putc, + .putcs = fbcon_ilbm_putcs, + .revc = fbcon_ilbm_revc, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-iplan2p2.c renamed from drivers/video/fbcon-iplan2p2.c.old +8 -8
@@ -438,14 +438,14 @@*/ struct display_switch fbcon_iplan2p2 = { - setup: fbcon_iplan2p2_setup, - bmove: fbcon_iplan2p2_bmove, - clear: fbcon_iplan2p2_clear, - putc: fbcon_iplan2p2_putc, - putcs: fbcon_iplan2p2_putcs, - revc: fbcon_iplan2p2_revc, - clear_margins: fbcon_iplan2p2_clear_margins, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_iplan2p2_setup, + .bmove = fbcon_iplan2p2_bmove, + .clear = fbcon_iplan2p2_clear, + .putc = fbcon_iplan2p2_putc, + .putcs = fbcon_iplan2p2_putcs, + .revc = fbcon_iplan2p2_revc, + .clear_margins = fbcon_iplan2p2_clear_margins, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-iplan2p4.c renamed from drivers/video/fbcon-iplan2p4.c.old +8 -8
@@ -459,14 +459,14 @@*/ struct display_switch fbcon_iplan2p4 = { - setup: fbcon_iplan2p4_setup, - bmove: fbcon_iplan2p4_bmove, - clear: fbcon_iplan2p4_clear, - putc: fbcon_iplan2p4_putc, - putcs: fbcon_iplan2p4_putcs, - revc: fbcon_iplan2p4_revc, - clear_margins: fbcon_iplan2p4_clear_margins, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_iplan2p4_setup, + .bmove = fbcon_iplan2p4_bmove, + .clear = fbcon_iplan2p4_clear, + .putc = fbcon_iplan2p4_putc, + .putcs = fbcon_iplan2p4_putcs, + .revc = fbcon_iplan2p4_revc, + .clear_margins = fbcon_iplan2p4_clear_margins, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-iplan2p8.c renamed from drivers/video/fbcon-iplan2p8.c.old +8 -8
@@ -496,14 +496,14 @@*/ struct display_switch fbcon_iplan2p8 = { - setup: fbcon_iplan2p8_setup, - bmove: fbcon_iplan2p8_bmove, - clear: fbcon_iplan2p8_clear, - putc: fbcon_iplan2p8_putc, - putcs: fbcon_iplan2p8_putcs, - revc: fbcon_iplan2p8_revc, - clear_margins: fbcon_iplan2p8_clear_margins, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_iplan2p8_setup, + .bmove = fbcon_iplan2p8_bmove, + .clear = fbcon_iplan2p8_clear, + .putc = fbcon_iplan2p8_putc, + .putcs = fbcon_iplan2p8_putcs, + .revc = fbcon_iplan2p8_revc, + .clear_margins = fbcon_iplan2p8_clear_margins, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-mfb.c renamed from drivers/video/fbcon-mfb.c.old +8 -8
@@ -179,14 +179,14 @@*/ struct display_switch fbcon_mfb = { - setup: fbcon_mfb_setup, - bmove: fbcon_mfb_bmove, - clear: fbcon_mfb_clear, - putc: fbcon_mfb_putc, - putcs: fbcon_mfb_putcs, - revc: fbcon_mfb_revc, - clear_margins: fbcon_mfb_clear_margins, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_mfb_setup, + .bmove = fbcon_mfb_bmove, + .clear = fbcon_mfb_clear, + .putc = fbcon_mfb_putc, + .putcs = fbcon_mfb_putcs, + .revc = fbcon_mfb_revc, + .clear_margins = fbcon_mfb_clear_margins, + .fontwidthmask =FONTWIDTH (8 ) };
drivers/video/fbcon-vga-planes.c renamed from drivers/video/fbcon-vga-planes.c.old +14 -14
@@ -329,23 +329,23 @@ }struct display_switch fbcon_vga_planes = { - setup: fbcon_vga_planes_setup, - bmove: fbcon_vga_planes_bmove, - clear: fbcon_vga_planes_clear, - putc: fbcon_vga_planes_putc, - putcs: fbcon_vga_planes_putcs, - revc: fbcon_vga_planes_revc, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_vga_planes_setup, + .bmove = fbcon_vga_planes_bmove, + .clear = fbcon_vga_planes_clear, + .putc = fbcon_vga_planes_putc, + .putcs = fbcon_vga_planes_putcs, + .revc = fbcon_vga_planes_revc, + .fontwidthmask =FONTWIDTH (8 ) };struct display_switch fbcon_ega_planes = { - setup: fbcon_vga_planes_setup, - bmove: fbcon_vga_planes_bmove, - clear: fbcon_vga_planes_clear, - putc: fbcon_ega_planes_putc, - putcs: fbcon_ega_planes_putcs, - revc: fbcon_vga_planes_revc, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_vga_planes_setup, + .bmove = fbcon_vga_planes_bmove, + .clear = fbcon_vga_planes_clear, + .putc = fbcon_ega_planes_putc, + .putcs = fbcon_ega_planes_putcs, + .revc = fbcon_vga_planes_revc, + .fontwidthmask =FONTWIDTH (8 ) };#ifdef MODULE
drivers/video/g364fb.c renamed from drivers/video/g364fb.c.old +21 -21
51 lines not on this page · raw message
drivers/video/neofb.c renamed from drivers/video/neofb.c.old +59 -59
134 lines not on this page · raw message
drivers/video/pm2fb.c renamed from drivers/video/pm2fb.c.old +1 -1
@@ -1451,7 +1451,7 @@ .cursor = pm2fb_cursor, .set_font = pm2fb_set_font, .clear_margins =pm2fb_clear_margins8, - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16) }; + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16) };#endif /* FBCON_HAS_CFB8 */ #ifdef FBCON_HAS_CFB16
drivers/video/retz3fb.c renamed from drivers/video/retz3fb.c.old +8 -8
@@ -1589,13 +1589,13 @@static struct display_switch fbcon_retz3_8 = { - setup: fbcon_cfb8_setup, - bmove: retz3_8_bmove, - clear: retz3_8_clear, - putc: retz3_putc, - putcs: retz3_putcs, - revc: retz3_revc, - clear_margins: retz3_clear_margins, - fontwidthmask:FONTWIDTH (8 ) + .setup = fbcon_cfb8_setup, + .bmove = retz3_8_bmove, + .clear = retz3_8_clear, + .putc = retz3_putc, + .putcs = retz3_putcs, + .revc = retz3_revc, + .clear_margins = retz3_clear_margins, + .fontwidthmask =FONTWIDTH (8 ) };#endif
Signature · 9 lines
They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety. -- Benjamin Franklin, Historical Review of Pennsylvania, 1759 ------------------------------------------------------- This SF.net email is sponsored by: Get the new Palm Tungsten T handheld. Power & Color in a compact size! http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0002en
James Simmons
Applieddrivers/video/aty128fb.c
Quoted 3 lines
drivers/video/aty128fb.c renamed from drivers/video/aty128fb.c.old +0
-0
Updated to new api. Those structs are gone.
drivers/video/controlfb.c
Quoted 2 lines
drivers/video/controlfb.c renamed from drivers/video/controlfb.c.old +0
-0
Have to look. It has been updated but I don't have hardware to test it. I think those structs are gone.
Quoted 1 line
+++
linux-2.5.49/drivers/video/fbcon-afb.c2002-11-22 19:56:18.000000000
[snip]
All fbcon-*.c files are gone. The framebuffer console is now acceleration driven via fillrect, copyarea, and image blits.
Quoted 1 line
+++
linux-2.5.49/drivers/video/g364fb.c2002-11-23 10:03:25.000000000 -0600
Applied.
Quoted 1 line
+++
linux-2.5.49/drivers/video/neofb.c2002-11-22 19:56:18.000000000 -0600
Been applied for awhile.
Quoted 1 line
+++
linux-2.5.49/drivers/video/pm2fb.c2002-11-22 19:56:39.000000000 -0600
Being rewritten to new api.
Quoted 1 line
--- linux-2.5.49/drivers/video/retz3fb.c.old 2002-08-27 19:11:03.000000000 -0500
Needs to ported to new api.
The aty128 driver also needs a few updates to C99. I will do that tonight.
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf