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

vt: move vc_translate to vt.c and rename it 



vc_translate is used only in vt.c, so move the definition from a header
there. Also, it used to be a macro, so be modern and make a static
inline from it. This makes the code actually readable.

And as a preparation for next patches, rename it to vc_translate_ascii.
vc_translate will be a wrapper for both unicode and this one.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-10-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a6f72d9

drivers/tty/vt/vt.c

+13 −1
Original line number Diff line number Diff line
@@ -2560,6 +2560,18 @@ static void con_flush(struct vc_data *vc, unsigned long draw_from, 
	*draw_x = -1;

}



static inline int vc_translate_ascii(const struct vc_data *vc, int c)

{

	if (IS_ENABLED(CONFIG_CONSOLE_TRANSLATIONS)) {

		if (vc->vc_toggle_meta)

			c |= 0x80;



		return vc->vc_translate[c];

	}



	return c;

}



/* acquires console_lock */

static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int count)

{
@@ -2687,7 +2699,7 @@ rescan_last_byte: 
			c = 0xfffd;

		    tc = c;

		} else {	/* no utf or alternate charset mode */

		    tc = vc_translate(vc, c);

			tc = vc_translate_ascii(vc, c);

		}



		param.c = tc;

include/linux/vt_kern.h

+0 −3
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ int con_set_default_unimap(struct vc_data *vc); 
void con_free_unimap(struct vc_data *vc);

int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);



#define vc_translate(vc, c) ((vc)->vc_translate[(c) |			\

					((vc)->vc_toggle_meta ? 0x80 : 0)])

#else

static inline int con_set_trans_old(unsigned char __user *table)

{
@@ -124,7 +122,6 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc) 
	return 0;

}



#define vc_translate(vc, c) (c)

#endif



/* vt.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE