random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 22:28:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

video: Tidy up the check for valid fonts

Browse Source 
Put this check into a function so we can use it elsewhere. Also drop the
macros which do the same thing but are not actually used.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-06 08:36:10 -06:00 committed by Anatolij Gustschin
parent 0d3890188d
commit 5330612f21
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/video/console_truetype.c
View File

@ -526,9 +526,18 @@ static struct font_info font_table[] = {
{} /* sentinel */
};
#define FONT_BEGIN(name) __ttf_ ## name ## _begin
#define FONT_END(name) __ttf_ ## name ## _end
#define FONT_IS_VALID(name) (abs(FONT_END(name) - FONT_BEGIN) > 4)
/**
* font_valid() - Check if a font-table entry is valid
*
* Depending on available files in the build system, fonts may end up being
* empty.
*
* @return true if the entry is valid
*/
static inline bool font_valid(struct font_info *tab)
{
return abs(tab->begin - tab->end) > 4;
}
/**
* console_truetype_find_font() - Find a suitable font
@ -542,7 +551,7 @@ static u8 *console_truetype_find_font(void)
struct font_info *tab;
for (tab = font_table; tab->begin; tab++) {
if (abs(tab->begin - tab->end) > 4) {
if (font_valid(tab)) {
debug("%s: Font '%s', at %p, size %lx\n", __func__,
tab->name, tab->begin,
(ulong)(tab->end - tab->begin));