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

tty/vt: consolemap: introduce enum translation_map and use it 



Again, instead of magic constants in the code, declare an enum and be a
little bit more explicit. Both in the translations definition and in the
loops etc.

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


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

drivers/tty/vt/consolemap.c

+20 −19
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


static unsigned short translations[][256] = {

  /* 8-bit Latin-1 mapped to Unicode -- trivial mapping */

  {

  [LAT1_MAP] = {

    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,

    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,

    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
@@ -73,7 +73,7 @@ static unsigned short translations[][256] = { 
    0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff

  },

  /* VT100 graphics mapped to Unicode */

  {

  [GRAF_MAP] = {

    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,

    0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,

    0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
@@ -108,7 +108,7 @@ static unsigned short translations[][256] = { 
    0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff

  },

  /* IBM Codepage 437 mapped to Unicode */

  {

  [IBMPC_MAP] = {

    0x0000, 0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,

    0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,

    0x25b6, 0x25c0, 0x2195, 0x203c, 0x00b6, 0x00a7, 0x25ac, 0x21a8,
@@ -143,7 +143,7 @@ static unsigned short translations[][256] = { 
    0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0

  },

  /* User mapping -- default to codes for direct font mapping */

  {

  [USER_MAP] = {

    0xf000, 0xf001, 0xf002, 0xf003, 0xf004, 0xf005, 0xf006, 0xf007,

    0xf008, 0xf009, 0xf00a, 0xf00b, 0xf00c, 0xf00d, 0xf00e, 0xf00f,

    0xf010, 0xf011, 0xf012, 0xf013, 0xf014, 0xf015, 0xf016, 0xf017,
@@ -184,7 +184,7 @@ static unsigned short translations[][256] = { 


#define MAX_GLYPH 512		/* Max possible glyph value */



static int inv_translate[MAX_NR_CONSOLES];

static enum translation_map inv_translate[MAX_NR_CONSOLES];



#define UNI_DIRS	32U

#define UNI_DIR_ROWS	32U
@@ -208,24 +208,25 @@ struct uni_pagedict { 
	u16		**uni_pgdir[UNI_DIRS];

	unsigned long	refcount;

	unsigned long	sum;

	unsigned char	*inverse_translations[4];

	unsigned char	*inverse_translations[LAST_MAP + 1];

	u16		*inverse_trans_unicode;

};



static struct uni_pagedict *dflt;



static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p, int i)

static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p,

	       enum translation_map m)

{

	int j, glyph;

	unsigned short *t = translations[i];

	unsigned short *t = translations[m];

	unsigned char *q;

	

	if (!p)

		return;

	q = p->inverse_translations[i];

	q = p->inverse_translations[m];



	if (!q) {

		q = p->inverse_translations[i] = kmalloc(MAX_GLYPH, GFP_KERNEL);

		q = p->inverse_translations[m] = kmalloc(MAX_GLYPH, GFP_KERNEL);

		if (!q)

			return;

	}
@@ -276,7 +277,7 @@ static void set_inverse_trans_unicode(struct vc_data *conp, 
	}

}



unsigned short *set_translate(int m, struct vc_data *vc)

unsigned short *set_translate(enum translation_map m, struct vc_data *vc)

{

	inv_translate[vc->vc_num] = m;

	return translations[m];
@@ -292,7 +293,7 @@ unsigned short *set_translate(int m, struct vc_data *vc) 
u16 inverse_translate(const struct vc_data *conp, u16 glyph, bool use_unicode)

{

	struct uni_pagedict *p;

	int m;

	enum translation_map m;



	if (glyph >= MAX_GLYPH)

		return 0;
@@ -669,8 +670,8 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list) 
	if (con_unify_unimap(vc, p))

		goto out_unlock;



	for (i = 0; i <= 3; i++)

		set_inverse_transl(vc, p, i); /* Update inverse translations */

	for (enum translation_map m = FIRST_MAP; m <= LAST_MAP; m++)

		set_inverse_transl(vc, p, m); /* Update inverse translations */

	set_inverse_trans_unicode(vc, p);



out_unlock:
@@ -731,8 +732,8 @@ int con_set_default_unimap(struct vc_data *vc) 
		return err;

	}



	for (i = 0; i <= 3; i++)

		set_inverse_transl(vc, p, i);	/* Update all inverse translations */

	for (enum translation_map m = FIRST_MAP; m <= LAST_MAP; m++)

		set_inverse_transl(vc, p, m);	/* Update all inverse translations */

	set_inverse_trans_unicode(vc, p);

	dflt = p;

	return err;

include/linux/consolemap.h

+12 −6
Original line number Diff line number Diff line
@@ -7,10 +7,15 @@ 
#ifndef __LINUX_CONSOLEMAP_H__

#define __LINUX_CONSOLEMAP_H__



#define LAT1_MAP 0

#define GRAF_MAP 1

#define IBMPC_MAP 2

#define USER_MAP 3

enum translation_map {

	LAT1_MAP,

	GRAF_MAP,

	IBMPC_MAP,

	USER_MAP,



	FIRST_MAP = LAT1_MAP,

	LAST_MAP = USER_MAP,

};



#include <linux/types.h>
@@ -18,7 +23,7 @@ struct vc_data; 


#ifdef CONFIG_CONSOLE_TRANSLATIONS

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

unsigned short *set_translate(int m, struct vc_data *vc);

unsigned short *set_translate(enum translation_map m, struct vc_data *vc);

int conv_uni_to_pc(struct vc_data *conp, long ucs);

u32 conv_8bit_to_uni(unsigned char c);

int conv_uni_to_8bit(u32 uni);
@@ -30,7 +35,8 @@ static inline u16 inverse_translate(const struct vc_data *conp, u16 glyph, 
	return glyph;

}



static inline unsigned short *set_translate(int m, struct vc_data *vc)

static inline unsigned short *set_translate(enum translation_map m,

		struct vc_data *vc)

{

	return NULL;

}