diff options
| author | Dzmitry Sankouski <dsankouski@gmail.com> | 2023-03-07 13:21:14 +0300 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2023-03-07 15:57:19 +0100 |
| commit | 39c1fa2c212b8acf15dfbccd7b10c6de93ba88df (patch) | |
| tree | 799bc6e1d231a7eb93de3ddb6524aa6c9018890b /include/video_font_4x6.h | |
| parent | 0e177d5a95c020c6d7a0d4294de5c7f34f5bf664 (diff) | |
video console: implement multiple fonts configuration
This needed for unit testing different fonts.
Configured fonts are placed in an array of fonts.
First font is selected by default upon console probe.
Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[agust: fixed build error when bmp logo disabled]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include/video_font_4x6.h')
| -rw-r--r-- | include/video_font_4x6.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h index c7e6351b64..1b8c02510b 100644 --- a/include/video_font_4x6.h +++ b/include/video_font_4x6.h @@ -38,15 +38,12 @@ __END__; MSBit to LSBit = left to right. */ -#ifndef _VIDEO_FONT_DATA_ -#define _VIDEO_FONT_DATA_ +#ifndef _VIDEO_FONT_4X6_ +#define _VIDEO_FONT_4X6_ -#define VIDEO_FONT_CHARS 256 -#define VIDEO_FONT_WIDTH 4 -#define VIDEO_FONT_HEIGHT 6 -#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT) +#include <video_font_data.h> -static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { +static unsigned char video_fontdata_4x6[VIDEO_FONT_SIZE(256, 4, 6)] = { /*{*/ /* Char 0: ' ' */ |