lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/36] tty/vt: consolemap: convert macros to static inlines
    Date
    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.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    include/linux/consolemap.h | 35 ++++++++++++++++++++++++++++-------
    1 file changed, 28 insertions(+), 7 deletions(-)

    diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h
    index abc28e4450bf..98171dbed51f 100644
    --- a/include/linux/consolemap.h
    +++ b/include/linux/consolemap.h
    @@ -14,9 +14,9 @@

    #include <linux/types.h>

    -#ifdef CONFIG_CONSOLE_TRANSLATIONS
    struct vc_data;

    +#ifdef CONFIG_CONSOLE_TRANSLATIONS
    u16 inverse_translate(const struct vc_data *conp, int glyph, int use_unicode);
    unsigned short *set_translate(int m, struct vc_data *vc);
    int conv_uni_to_pc(struct vc_data *conp, long ucs);
    @@ -24,12 +24,33 @@ u32 conv_8bit_to_uni(unsigned char c);
    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)
    +static inline u16 inverse_translate(const struct vc_data *conp, int glyph,
    + int use_unicode)
    +{
    + return glyph;
    +}
    +
    +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 /* __LINUX_CONSOLEMAP_H__ */
    --
    2.36.1
    \
     
     \ /
      Last update: 2022-06-07 12:53    [W:3.264 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site