Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge git://git.infradead.org/embedded-2.6
* git://git.infradead.org/embedded-2.6:
Make console charset translation optional
+8
drivers/char/Kconfig
+8
drivers/char/Kconfig
···
36
36
If unsure, say Y, or else you won't be able to do much with your new
37
37
shiny Linux system :-)
38
38
39
+
config CONSOLE_TRANSLATIONS
40
+
depends on VT
41
+
default y
42
+
bool "Enable character translations in console" if EMBEDDED
43
+
---help---
44
+
This enables support for font mapping and Unicode translation
45
+
on virtual consoles.
46
+
39
47
config VT_CONSOLE
40
48
bool "Support for console on virtual terminal" if EMBEDDED
41
49
depends on VT
+2
-2
drivers/char/Makefile
+2
-2
drivers/char/Makefile
···
12
12
obj-$(CONFIG_LEGACY_PTYS) += pty.o
13
13
obj-$(CONFIG_UNIX98_PTYS) += pty.o
14
14
obj-y += misc.o
15
-
obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o consolemap.o \
16
-
consolemap_deftbl.o selection.o keyboard.o
15
+
obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o
16
+
obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
17
17
obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
18
18
obj-$(CONFIG_AUDIT) += tty_audit.o
19
19
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
+1
-1
drivers/char/vt.c
+1
-1
drivers/char/vt.c
+14
include/linux/consolemap.h
+14
include/linux/consolemap.h
···
3
3
*
4
4
* Interface between console.c, selection.c and consolemap.c
5
5
*/
6
+
#ifndef __LINUX_CONSOLEMAP_H__
7
+
#define __LINUX_CONSOLEMAP_H__
8
+
6
9
#define LAT1_MAP 0
7
10
#define GRAF_MAP 1
8
11
#define IBMPC_MAP 2
···
13
10
14
11
#include <linux/types.h>
15
12
13
+
#ifdef CONFIG_CONSOLE_TRANSLATIONS
16
14
struct vc_data;
17
15
18
16
extern u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode);
···
22
18
extern u32 conv_8bit_to_uni(unsigned char c);
23
19
extern int conv_uni_to_8bit(u32 uni);
24
20
void console_map_init(void);
21
+
#else
22
+
#define inverse_translate(conp, glyph, uni) ((uint16_t)glyph)
23
+
#define set_translate(m, vc) ((unsigned short *)NULL)
24
+
#define conv_uni_to_pc(conp, ucs) ((int) (ucs > 0xff ? -1: ucs))
25
+
#define conv_8bit_to_uni(c) ((uint32_t)(c))
26
+
#define conv_uni_to_8bit(c) ((int) ((c) & 0xff))
27
+
#define console_map_init(c) do { ; } while (0)
28
+
#endif /* CONFIG_CONSOLE_TRANSLATIONS */
29
+
30
+
#endif /* __LINUX_CONSOLEMAP_H__ */
+19
include/linux/vt_kern.h
+19
include/linux/vt_kern.h
···
12
12
#include <linux/mutex.h>
13
13
#include <linux/console_struct.h>
14
14
#include <linux/mm.h>
15
+
#include <linux/consolemap.h>
15
16
16
17
/*
17
18
* Presently, a lot of graphics programs do not restore the contents of
···
55
54
struct tty_struct;
56
55
int tioclinux(struct tty_struct *tty, unsigned long arg);
57
56
57
+
#ifdef CONFIG_CONSOLE_TRANSLATIONS
58
58
/* consolemap.c */
59
59
60
60
struct unimapinit;
···
72
70
void con_free_unimap(struct vc_data *vc);
73
71
void con_protect_unimap(struct vc_data *vc, int rdonly);
74
72
int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc);
73
+
74
+
#define vc_translate(vc, c) ((vc)->vc_translate[(c) | \
75
+
(vc)->vc_toggle_meta ? 0x80 : 0])
76
+
#else
77
+
#define con_set_trans_old(arg) (0)
78
+
#define con_get_trans_old(arg) (-EINVAL)
79
+
#define con_set_trans_new(arg) (0)
80
+
#define con_get_trans_new(arg) (-EINVAL)
81
+
#define con_clear_unimap(vc, ui) (0)
82
+
#define con_set_unimap(vc, ct, list) (0)
83
+
#define con_set_default_unimap(vc) (0)
84
+
#define con_copy_unimap(d, s) (0)
85
+
#define con_get_unimap(vc, ct, uct, list) (-EINVAL)
86
+
#define con_free_unimap(vc) do { ; } while (0)
87
+
88
+
#define vc_translate(vc, c) (c)
89
+
#endif
75
90
76
91
/* vt.c */
77
92
int vt_waitactive(int vt);