diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 12:02:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 12:02:08 -0700 |
| commit | ff5d48a6d18d09bb750d1f89f6464f5fdb6fc85b (patch) | |
| tree | 243a2157912d6183c99d98dc74fe7a87a5cfbf6e /include/linux/consolemap.h | |
| parent | 762b8291be6944bd891fbe2c8976a2b2e5bbc726 (diff) | |
| parent | a29ccf6f823a84d89e1c7aaaf221cf7282022024 (diff) | |
Merge git://git.infradead.org/embedded-2.6
* git://git.infradead.org/embedded-2.6:
Make console charset translation optional
Diffstat (limited to 'include/linux/consolemap.h')
| -rw-r--r-- | include/linux/consolemap.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h index e2bf7e5db39a..c4811da1338b 100644 --- a/include/linux/consolemap.h +++ b/include/linux/consolemap.h @@ -3,6 +3,9 @@ * * Interface between console.c, selection.c and consolemap.c */ +#ifndef __LINUX_CONSOLEMAP_H__ +#define __LINUX_CONSOLEMAP_H__ + #define LAT1_MAP 0 #define GRAF_MAP 1 #define IBMPC_MAP 2 @@ -10,6 +13,7 @@ #include <linux/types.h> +#ifdef CONFIG_CONSOLE_TRANSLATIONS struct vc_data; extern u16 inverse_translate(struct vc_data *conp, int glyph, int use_unicode); @@ -18,3 +22,13 @@ extern int conv_uni_to_pc(struct vc_data *conp, long ucs); extern u32 conv_8bit_to_uni(unsigned char c); extern int conv_uni_to_8bit(u32 uni); void console_map_init(void); +#else +#define inverse_translate(conp, glyph, uni) ((uint16_t)glyph) +#define set_translate(m, vc) ((unsigned short *)NULL) +#define conv_uni_to_pc(conp, ucs) ((int) (ucs > 0xff ? -1: ucs)) +#define conv_8bit_to_uni(c) ((uint32_t)(c)) +#define conv_uni_to_8bit(c) ((int) ((c) & 0xff)) +#define console_map_init(c) do { ; } while (0) +#endif /* CONFIG_CONSOLE_TRANSLATIONS */ + +#endif /* __LINUX_CONSOLEMAP_H__ */ |