From 0e177d5a95c020c6d7a0d4294de5c7f34f5bf664 Mon Sep 17 00:00:00 2001 From: Dzmitry Sankouski Date: Tue, 7 Mar 2023 13:21:13 +0300 Subject: [PATCH] video console: move 8x16 font data in named header Consistent font data header names needed to add new fonts. Signed-off-by: Dzmitry Sankouski Reviewed-by: Simon Glass --- include/video_font.h | 2 +- include/{video_font_data.h => video_font_8x16.h} | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) rename include/{video_font_data.h => video_font_8x16.h} (99%) diff --git a/include/video_font.h b/include/video_font.h index 5e23f70f85..b07c07662c 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -10,7 +10,7 @@ #ifdef CONFIG_VIDEO_FONT_4X6 #include #else -#include +#include #endif #endif /* _VIDEO_FONT_ */ diff --git a/include/video_font_data.h b/include/video_font_8x16.h similarity index 99% rename from include/video_font_data.h rename to include/video_font_8x16.h index 6e64198d1a..d3d4295032 100644 --- a/include/video_font_data.h +++ b/include/video_font_8x16.h @@ -6,8 +6,8 @@ * This file contains an 8x16 bitmap font for code page 437. */ -#ifndef _VIDEO_FONT_DATA_ -#define _VIDEO_FONT_DATA_ +#ifndef _VIDEO_FONT_8X16 +#define _VIDEO_FONT_8X16 #define VIDEO_FONT_CHARS 256 #define VIDEO_FONT_WIDTH 8 @@ -4623,7 +4623,6 @@ static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { 0x00, /* 00000000 */ 0x00, /* 00000000 */ 0x00, /* 00000000 */ - }; #endif -- 2.39.5