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

Commit 8ede5cce authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: vt, make color_table const 



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

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

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ struct vc_data *vc_deallocate(unsigned int currcons) 
#define VT100ID "\033[?1;2c"

#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 };



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

drivers/usb/misc/sisusbvga/sisusb_con.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ sisusbcon_save_screen(struct vc_data *c) 


/* interface routine */

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;

	int i, j;

drivers/video/console/fbcon.c

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx, 
			int height, int width);

static int fbcon_switch(struct vc_data *vc);

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);



/*
@@ -2652,7 +2652,7 @@ static struct fb_cmap palette_cmap = { 
	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]];

	int i, j, k, depth;

drivers/video/console/mdacon.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int mdacon_switch(struct vc_data *c) 
	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;

}

drivers/video/console/newport_con.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



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;

}