iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: vt, make color_table const

Browse Source 
This means all ->con_set_palette have to have the second parameter
const too now.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2016-03-31 10:08:16 +02:00 committed by Greg Kroah-Hartman
parent 34902b7f27
commit 8ede5cce4f
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/vt/vt.c
View File

@ -1039,7 +1039,7 @@ struct vc_data *vc_deallocate(unsigned int currcons)
#define VT100ID "\033[?1;2c" #define VT100ID "\033[?1;2c"
#define VT102ID "\033[?6c" #define VT102ID "\033[?6c"
unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7, const unsigned char color_table[] = { 0, 4, 2, 6, 1, 5, 3, 7,
8,12,10,14, 9,13,11,15 }; 8,12,10,14, 9,13,11,15 };
/* the default colour table, for VGA+ colour systems */ /* the default colour table, for VGA+ colour systems */

2
drivers/usb/misc/sisusbvga/sisusb_con.c
View File

@ -601,7 +601,7 @@ sisusbcon_save_screen(struct vc_data *c)
/* interface routine */ /* interface routine */
static int static int
sisusbcon_set_palette(struct vc_data *c, unsigned char *table) sisusbcon_set_palette(struct vc_data *c, const unsigned char *table)
{ {
struct sisusb_usb_data *sisusb; struct sisusb_usb_data *sisusb;
int i, j; int i, j;

4
drivers/video/console/fbcon.c
View File

@ -170,7 +170,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
int height, int width); int height, int width);
static int fbcon_switch(struct vc_data *vc); static int fbcon_switch(struct vc_data *vc);
static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch); static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch);
static int fbcon_set_palette(struct vc_data *vc, unsigned char *table); static int fbcon_set_palette(struct vc_data *vc, const unsigned char *table);
static int fbcon_scrolldelta(struct vc_data *vc, int lines); static int fbcon_scrolldelta(struct vc_data *vc, int lines);
/* /*
@ -2652,7 +2652,7 @@ static struct fb_cmap palette_cmap = {
0, 16, palette_red, palette_green, palette_blue, NULL 0, 16, palette_red, palette_green, palette_blue, NULL
}; };
static int fbcon_set_palette(struct vc_data *vc, unsigned char *table) static int fbcon_set_palette(struct vc_data *vc, const unsigned char *table)
{ {
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
int i, j, k, depth; int i, j, k, depth;

2
drivers/video/console/mdacon.c
View File

@ -481,7 +481,7 @@ static int mdacon_switch(struct vc_data *c)
return 1; /* redrawing needed */ return 1; /* redrawing needed */
} }
static int mdacon_set_palette(struct vc_data *c, unsigned char *table) static int mdacon_set_palette(struct vc_data *c, const unsigned char *table)
{ {
return -EINVAL; return -EINVAL;
} }

2
drivers/video/console/newport_con.c
View File

@ -574,7 +574,7 @@ static int newport_font_set(struct vc_data *vc, struct console_font *font, unsig
return newport_set_font(vc->vc_num, font); return newport_set_font(vc->vc_num, font);
} }
static int newport_set_palette(struct vc_data *vc, unsigned char *table) static int newport_set_palette(struct vc_data *vc, const unsigned char *table)
{ {
return -EINVAL; return -EINVAL;
} }

2
drivers/video/console/sticon.c
View File

@ -79,7 +79,7 @@ static const char *sticon_startup(void)
return "STI console"; return "STI console";
} }
static int sticon_set_palette(struct vc_data *c, unsigned char *table) static int sticon_set_palette(struct vc_data *c, const unsigned char *table)
{ {
return -EINVAL; return -EINVAL;
} }

5
drivers/video/console/vgacon.c
View File

@ -80,7 +80,6 @@ static void vgacon_deinit(struct vc_data *c);
static void vgacon_cursor(struct vc_data *c, int mode); static void vgacon_cursor(struct vc_data *c, int mode);
static int vgacon_switch(struct vc_data *c); static int vgacon_switch(struct vc_data *c);
static int vgacon_blank(struct vc_data *c, int blank, int mode_switch); static int vgacon_blank(struct vc_data *c, int blank, int mode_switch);
static int vgacon_set_palette(struct vc_data *vc, unsigned char *table);
static int vgacon_scrolldelta(struct vc_data *c, int lines); static int vgacon_scrolldelta(struct vc_data *c, int lines);
static int vgacon_set_origin(struct vc_data *c); static int vgacon_set_origin(struct vc_data *c);
static void vgacon_save_screen(struct vc_data *c); static void vgacon_save_screen(struct vc_data *c);
@ -847,7 +846,7 @@ static int vgacon_switch(struct vc_data *c)
return 0; /* Redrawing not needed */ return 0; /* Redrawing not needed */
} }
static void vga_set_palette(struct vc_data *vc, unsigned char *table) static void vga_set_palette(struct vc_data *vc, const unsigned char *table)
{ {
int i, j; int i, j;
@ -860,7 +859,7 @@ static void vga_set_palette(struct vc_data *vc, unsigned char *table)
} }
} }
static int vgacon_set_palette(struct vc_data *vc, unsigned char *table) static int vgacon_set_palette(struct vc_data *vc, const unsigned char *table)
{ {
#ifdef CAN_LOAD_PALETTE #ifdef CAN_LOAD_PALETTE
if (vga_video_type != VIDEO_TYPE_VGAC || vga_palette_blanked if (vga_video_type != VIDEO_TYPE_VGAC || vga_palette_blanked

2
include/linux/console.h
View File

@ -47,7 +47,7 @@ struct consw {
int (*con_font_copy)(struct vc_data *, int); int (*con_font_copy)(struct vc_data *, int);
int (*con_resize)(struct vc_data *, unsigned int, unsigned int, int (*con_resize)(struct vc_data *, unsigned int, unsigned int,
unsigned int); unsigned int);
int (*con_set_palette)(struct vc_data *, unsigned char *); int (*con_set_palette)(struct vc_data *, const unsigned char *);
int (*con_scrolldelta)(struct vc_data *, int); int (*con_scrolldelta)(struct vc_data *, int);
int (*con_set_origin)(struct vc_data *); int (*con_set_origin)(struct vc_data *);
void (*con_save_screen)(struct vc_data *); void (*con_save_screen)(struct vc_data *);

2
include/linux/selection.h
View File

@ -24,7 +24,7 @@ extern void mouse_report(struct tty_struct * tty, int butt, int mrx, int mry);
extern int console_blanked; extern int console_blanked;
extern unsigned char color_table[]; extern const unsigned char color_table[];
extern int default_red[]; extern int default_red[];
extern int default_grn[]; extern int default_grn[];
extern int default_blu[]; extern int default_blu[];