constify vga16fb.c
Helge Deller
maintainerPATCH 5/5 constify vga16fb.c
- move some static data into the .rodata section
- simplify source code for transl_l[] and transl_h[] which makes it more readable
- move some static data into the .rodata section
- simplify source code for transl_l[] and transl_h[] which makes it more readable
drivers/video/vga16fb.c +12 -16
@@ -264,7 +264,7 @@ static void vga16fb_clock_chip(struct vg const struct fb_info *info, int mul, int div) { - static struct { + static const struct { u32 pixclock; u8 misc; u8 seq_clock_mode;
@@ -652,7 +652,7 @@ static int vga16fb_set_par(struct fb_infstatic void ega16_setpalette (int regno,unsigned red,unsigned green,unsigned blue) { -static unsigned char map[] = {000 ,001 ,010 ,011 }; +static const unsigned char map[] = {000 ,001 ,010 ,011 };int val;if (regno >=16 )
@@ -1139,23 +1139,19 @@ static void vga16fb_copyarea(struct fb_i } } -#ifdef __LITTLE_ENDIAN -static unsigned int transl_l[] = -{0x0 ,0x8 ,0x4 ,0xC ,0x2 ,0xA ,0x6 ,0xE ,0x1 ,0x9 ,0x5 ,0xD ,0x3 ,0xB ,0x7 ,0xF }; -static unsigned int transl_h[] = -{0x000 ,0x800 ,0x400 ,0xC00 ,0x200 ,0xA00 ,0x600 ,0xE00 , -0x100 ,0x900 ,0x500 ,0xD00 ,0x300 ,0xB00 ,0x700 ,0xF00 }; -#else -#ifdef __BIG_ENDIAN -static unsigned int transl_h[] = -{0x0 ,0x8 ,0x4 ,0xC ,0x2 ,0xA ,0x6 ,0xE ,0x1 ,0x9 ,0x5 ,0xD ,0x3 ,0xB ,0x7 ,0xF }; -static unsigned int transl_l[] = -{0x000 ,0x800 ,0x400 ,0xC00 ,0x200 ,0xA00 ,0x600 ,0xE00 , -0x100 ,0x900 ,0x500 ,0xD00 ,0x300 ,0xB00 ,0x700 ,0xF00 }; +#define TRANS_MASK_LOW {0x0,0x8,0x4,0xC,0x2,0xA,0x6,0xE,0x1,0x9,0x5,0xD,0x3,0xB,0x7,0xF} +#define TRANS_MASK_HIGH {0x000, 0x800, 0x400, 0xC00, 0x200, 0xA00, 0x600, 0xE00, \ + 0x100, 0x900, 0x500, 0xD00, 0x300, 0xB00, 0x700, 0xF00} + +#if defined(__LITTLE_ENDIAN) +static const u16 transl_l[] =TRANS_MASK_LOW ; +static const u16 transl_h[] =TRANS_MASK_HIGH ; +#elif defined(__BIG_ENDIAN) +static const u16 transl_l[] =TRANS_MASK_HIGH ; +static const u16 transl_h[] =TRANS_MASK_LOW ;#else #error "Only __BIG_ENDIAN and __LITTLE_ENDIAN are supported in vga-planes"#endif -#endif static void vga_8planes_imageblit (struct fb_info *info,const struct fb_image *image) {
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Linux-fbdev-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel