Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91e74ca5 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: vt, use proper type for default colors 



Every user of default_red, default_grn, and default_blu treats them as
unsigned char. So make it really unsigned char.

And indent the initializers and module_param properly.

This saves ~ 100 bytes of data.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ede5cce

drivers/tty/vt/vt.c

+17 −10
Original line number Diff line number Diff line
@@ -1043,16 +1043,23 @@ const unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7, 
				       8,12,10,14, 9,13,11,15 };



/* the default colour table, for VGA+ colour systems */

int default_red[] = {0x00,0xaa,0x00,0xaa,0x00,0xaa,0x00,0xaa,

    0x55,0xff,0x55,0xff,0x55,0xff,0x55,0xff};

int default_grn[] = {0x00,0x00,0xaa,0x55,0x00,0x00,0xaa,0xaa,

    0x55,0x55,0xff,0xff,0x55,0x55,0xff,0xff};

int default_blu[] = {0x00,0x00,0x00,0x00,0xaa,0xaa,0xaa,0xaa,

    0x55,0x55,0x55,0x55,0xff,0xff,0xff,0xff};



module_param_array(default_red, int, NULL, S_IRUGO | S_IWUSR);

module_param_array(default_grn, int, NULL, S_IRUGO | S_IWUSR);

module_param_array(default_blu, int, NULL, S_IRUGO | S_IWUSR);

unsigned char default_red[] = {

	0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa,

	0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff

};

module_param_array(default_red, byte, NULL, S_IRUGO | S_IWUSR);



unsigned char default_grn[] = {

	0x00, 0x00, 0xaa, 0x55, 0x00, 0x00, 0xaa, 0xaa,

	0x55, 0x55, 0xff, 0xff, 0x55, 0x55, 0xff, 0xff

};

module_param_array(default_grn, byte, NULL, S_IRUGO | S_IWUSR);



unsigned char default_blu[] = {

	0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa,

	0x55, 0x55, 0x55, 0x55, 0xff, 0xff, 0xff, 0xff

};

module_param_array(default_blu, byte, NULL, S_IRUGO | S_IWUSR);



/*

 * gotoxy() must verify all boundaries, because the arguments

include/linux/selection.h

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry); 
extern int console_blanked;



extern const unsigned char color_table[];

extern int default_red[];

extern int default_grn[];

extern int default_blu[];

extern unsigned char default_red[];

extern unsigned char default_grn[];

extern unsigned char default_blu[];



extern unsigned short *screen_pos(struct vc_data *vc, int w_offset, int viewed);

extern u16 screen_glyph(struct vc_data *vc, int offset);