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

tty/vt: consolemap: make parameters of inverse_translate() saner 



- int use_unicode -> bool: it's used as bool at some places already, so
  make it explicit.
- int glyph -> u16: every caller passes a u16 in. So make it explicit
  too. And remove a negative check from inverse_translate() as it never
  could be negative.

Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-7-jslaby@suse.cz


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

drivers/accessibility/braille/braille_console.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void vc_refresh(struct vc_data *vc) 
	for (i = 0; i < WIDTH; i++) {

		u16 glyph = screen_glyph(vc,

				2 * (vc_x + i) + vc_y * vc->vc_size_row);

		buf[i] = inverse_translate(vc, glyph, 1);

		buf[i] = inverse_translate(vc, glyph, true);

	}

	braille_write(buf);

}

drivers/accessibility/speakup/main.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static u16 get_char(struct vc_data *vc, u16 *pos, u_char *attribs) 
			c |= 0x100;

		}



		ch = inverse_translate(vc, c, 1);

		ch = inverse_translate(vc, c, true);

		*attribs = (w & 0xff00) >> 8;

	}

	return ch;

drivers/tty/vt/consolemap.c

+2 −2
Original line number Diff line number Diff line
@@ -281,12 +281,12 @@ unsigned short *set_translate(int m, struct vc_data *vc) 
 *    was active.

 * Still, it is now possible to a certain extent to cut and paste non-ASCII.

 */

u16 inverse_translate(const struct vc_data *conp, int glyph, int use_unicode)

u16 inverse_translate(const struct vc_data *conp, u16 glyph, bool use_unicode)

{

	struct uni_pagedict *p;

	int m;



	if (glyph < 0 || glyph >= MAX_GLYPH)

	if (glyph >= MAX_GLYPH)

		return 0;



	p = *conp->vc_uni_pagedir_loc;

drivers/tty/vt/selection.c

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ sel_pos(int n, bool unicode) 
{

	if (unicode)

		return screen_glyph_unicode(vc_sel.cons, n / 2);

	return inverse_translate(vc_sel.cons, screen_glyph(vc_sel.cons, n), 0);

	return inverse_translate(vc_sel.cons, screen_glyph(vc_sel.cons, n),

			false);

}



/**

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -4741,7 +4741,7 @@ u32 screen_glyph_unicode(const struct vc_data *vc, int n) 


	if (uniscr)

		return uniscr->lines[n / vc->vc_cols][n % vc->vc_cols];

	return inverse_translate(vc, screen_glyph(vc, n * 2), 1);

	return inverse_translate(vc, screen_glyph(vc, n * 2), true);

}

EXPORT_SYMBOL_GPL(screen_glyph_unicode);