aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/tty/vt/vt.c27
-rw-r--r--include/linux/selection.h6
2 files changed, 20 insertions, 13 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 2c71b3bde174..8f9f8ed3ed09 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1043,16 +1043,23 @@ const unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7,
1043 8,12,10,14, 9,13,11,15 }; 1043 8,12,10,14, 9,13,11,15 };
1044 1044
1045/* the default colour table, for VGA+ colour systems */ 1045/* the default colour table, for VGA+ colour systems */
1046int default_red[] = {0x00,0xaa,0x00,0xaa,0x00,0xaa,0x00,0xaa, 1046unsigned char default_red[] = {
1047 0x55,0xff,0x55,0xff,0x55,0xff,0x55,0xff}; 1047 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa,
1048int default_grn[] = {0x00,0x00,0xaa,0x55,0x00,0x00,0xaa,0xaa, 1048 0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff
1049 0x55,0x55,0xff,0xff,0x55,0x55,0xff,0xff}; 1049};
1050int default_blu[] = {0x00,0x00,0x00,0x00,0xaa,0xaa,0xaa,0xaa, 1050module_param_array(default_red, byte, NULL, S_IRUGO | S_IWUSR);
1051 0x55,0x55,0x55,0x55,0xff,0xff,0xff,0xff}; 1051
1052 1052unsigned char default_grn[] = {
1053module_param_array(default_red, int, NULL, S_IRUGO | S_IWUSR); 1053 0x00, 0x00, 0xaa, 0x55, 0x00, 0x00, 0xaa, 0xaa,
1054module_param_array(default_grn, int, NULL, S_IRUGO | S_IWUSR); 1054 0x55, 0x55, 0xff, 0xff, 0x55, 0x55, 0xff, 0xff
1055module_param_array(default_blu, int, NULL, S_IRUGO | S_IWUSR); 1055};
1056module_param_array(default_grn, byte, NULL, S_IRUGO | S_IWUSR);
1057
1058unsigned char default_blu[] = {
1059 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa,
1060 0x55, 0x55, 0x55, 0x55, 0xff, 0xff, 0xff, 0xff
1061};
1062module_param_array(default_blu, byte, NULL, S_IRUGO | S_IWUSR);
1056 1063
1057/* 1064/*
1058 * gotoxy() must verify all boundaries, because the arguments 1065 * gotoxy() must verify all boundaries, because the arguments
diff --git a/include/linux/selection.h b/include/linux/selection.h
index 7e6c4450b8a5..8e4624efdb6f 100644
--- a/include/linux/selection.h
+++ b/include/linux/selection.h
@@ -25,9 +25,9 @@ extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry);
25extern int console_blanked; 25extern int console_blanked;
26 26
27extern const unsigned char color_table[]; 27extern const unsigned char color_table[];
28extern int default_red[]; 28extern unsigned char default_red[];
29extern int default_grn[]; 29extern unsigned char default_grn[];
30extern int default_blu[]; 30extern unsigned char default_blu[];
31 31
32extern unsigned short *screen_pos(struct vc_data *vc, int w_offset, int viewed); 32extern unsigned short *screen_pos(struct vc_data *vc, int w_offset, int viewed);
33extern u16 screen_glyph(struct vc_data *vc, int offset); 33extern u16 screen_glyph(struct vc_data *vc, int offset);