Commit 4ee57308 authored by Peilin Ye's avatar Peilin Ye Committed by Daniel Vetter
Browse files

Fonts: Add charcount field to font_desc 



Subsystems are hard-coding the number of characters of our built-in fonts
as 256. Include that information in our kernel font descriptor, `struct
font_desc`.

Signed-off-by: default avatarPeilin Ye <yepeilin.cs@gmail.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/65952296d1d9486093bd955d1536f7dcd11112c6.1605169912.git.yepeilin.cs@gmail.com
parent 259a252c

include/linux/font.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct font_desc { 
    int idx;

    const char *name;

    unsigned int width, height;

    unsigned int charcount;

    const void *data;

    int pref;

};

lib/fonts/font_10x18.c

+1 −0
Original line number Diff line number Diff line
@@ -5137,6 +5137,7 @@ const struct font_desc font_10x18 = { 
	.name	= "10x18",

	.width	= 10,

	.height	= 18,

	.charcount = 256,

	.data	= fontdata_10x18.data,

#ifdef __sparc__

	.pref	= 5,

lib/fonts/font_6x10.c

+1 −0
Original line number Diff line number Diff line
@@ -3083,6 +3083,7 @@ const struct font_desc font_6x10 = { 
	.name	= "6x10",

	.width	= 6,

	.height	= 10,

	.charcount = 256,

	.data	= fontdata_6x10.data,

	.pref	= 0,

};

lib/fonts/font_6x11.c

+1 −0
Original line number Diff line number Diff line
@@ -3346,6 +3346,7 @@ const struct font_desc font_vga_6x11 = { 
	.name	= "ProFont6x11",

	.width	= 6,

	.height	= 11,

	.charcount = 256,

	.data	= fontdata_6x11.data,

	/* Try avoiding this font if possible unless on MAC */

	.pref	= -2000,

lib/fonts/font_6x8.c

+1 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,7 @@ const struct font_desc font_6x8 = { 
	.name	= "6x8",

	.width	= 6,

	.height	= 8,

	.charcount = 256,

	.data	= fontdata_6x8.data,

	.pref	= 0,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE