Commit f827c754 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

tty/vt: consolemap: convert macros to static inlines

This commit changes !CONFIG_CONSOLE_TRANSLATIONS definitions to real
(inline) functions. So the commit:
* makes type checking much stronger,
* removes the need of many parentheses and casts, and
* makes the code more readable.
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-6-jslaby@suse.czSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b75f796
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/types.h> #include <linux/types.h>
#ifdef CONFIG_CONSOLE_TRANSLATIONS
struct vc_data; struct vc_data;
#ifdef CONFIG_CONSOLE_TRANSLATIONS
u16 inverse_translate(const struct vc_data *conp, int glyph, int use_unicode); u16 inverse_translate(const struct vc_data *conp, int glyph, int use_unicode);
unsigned short *set_translate(int m, struct vc_data *vc); unsigned short *set_translate(int m, struct vc_data *vc);
int conv_uni_to_pc(struct vc_data *conp, long ucs); int conv_uni_to_pc(struct vc_data *conp, long ucs);
...@@ -24,12 +24,33 @@ u32 conv_8bit_to_uni(unsigned char c); ...@@ -24,12 +24,33 @@ u32 conv_8bit_to_uni(unsigned char c);
int conv_uni_to_8bit(u32 uni); int conv_uni_to_8bit(u32 uni);
void console_map_init(void); void console_map_init(void);
#else #else
#define inverse_translate(conp, glyph, uni) ((uint16_t)glyph) static inline u16 inverse_translate(const struct vc_data *conp, int glyph,
#define set_translate(m, vc) ((unsigned short *)NULL) int use_unicode)
#define conv_uni_to_pc(conp, ucs) ((int) (ucs > 0xff ? -1: ucs)) {
#define conv_8bit_to_uni(c) ((uint32_t)(c)) return glyph;
#define conv_uni_to_8bit(c) ((int) ((c) & 0xff)) }
#define console_map_init(c) do { ; } while (0)
static inline unsigned short *set_translate(int m, struct vc_data *vc)
{
return NULL;
}
static inline int conv_uni_to_pc(struct vc_data *conp, long ucs)
{
return ucs > 0xff ? -1 : ucs;
}
static inline u32 conv_8bit_to_uni(unsigned char c)
{
return c;
}
static inline int conv_uni_to_8bit(u32 uni)
{
return uni & 0xff;
}
static inline void console_map_init(void) { }
#endif /* CONFIG_CONSOLE_TRANSLATIONS */ #endif /* CONFIG_CONSOLE_TRANSLATIONS */
#endif /* __LINUX_CONSOLEMAP_H__ */ #endif /* __LINUX_CONSOLEMAP_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment