LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: Encapsulate font in video_font_data.h 

This patch moves all the font configuration values into video_font_data.h
so they are all in the right place with the font. The video_font.h now only
includes video_font_data.h and will allow us to select and include different
font once more fonts are added.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
[agust: fixed build warning for mcc200]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Marek Vasut 2013-07-30 23:37:57 +02:00 committed by Anatolij Gustschin
parent 2bc4aa5227
commit ac8ba84c56
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/cpu/mpc8xx/video.c
View File

@ -109,7 +109,6 @@ DECLARE_GLOBAL_DATA_PTR;
/************************************************************************/ /************************************************************************/
#include <video_font.h> /* Get font data, width and height */ #include <video_font.h> /* Get font data, width and height */
#include <video_font_data.h>
#ifdef CONFIG_VIDEO_LOGO #ifdef CONFIG_VIDEO_LOGO
#include <video_logo.h> /* Get logo data, width and height */ #include <video_logo.h> /* Get logo data, width and height */

1
common/lcd.c
View File

@ -51,7 +51,6 @@
/* ** FONT DATA */ /* ** FONT DATA */
/************************************************************************/ /************************************************************************/
#include <video_font.h> /* Get font data, width and height */ #include <video_font.h> /* Get font data, width and height */
#include <video_font_data.h>
/************************************************************************/ /************************************************************************/
/* ** LOGO DATA */ /* ** LOGO DATA */

1
drivers/video/cfb_console.c
View File

@ -197,7 +197,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <stdio_dev.h> #include <stdio_dev.h>
#include <video_font.h> #include <video_font.h>
#include <video_font_data.h>
#if defined(CONFIG_CMD_DATE) #if defined(CONFIG_CMD_DATE)
#include <rtc.h> #include <rtc.h>

1
drivers/video/sed156x.c
View File

@ -25,7 +25,6 @@
/* include the font data */ /* include the font data */
#include <video_font.h> #include <video_font.h>
#include <video_font_data.h>
#if VIDEO_FONT_WIDTH != 8 || VIDEO_FONT_HEIGHT != 16 #if VIDEO_FONT_WIDTH != 8 || VIDEO_FONT_HEIGHT != 16
#error Expecting VIDEO_FONT_WIDTH == 8 && VIDEO_FONT_HEIGHT == 16 #error Expecting VIDEO_FONT_WIDTH == 8 && VIDEO_FONT_HEIGHT == 16

5
include/video_font.h
View File

@ -8,9 +8,6 @@
#ifndef _VIDEO_FONT_ #ifndef _VIDEO_FONT_
#define _VIDEO_FONT_ #define _VIDEO_FONT_
#define VIDEO_FONT_CHARS 256 #include <video_font_data.h>
#define VIDEO_FONT_WIDTH 8
#define VIDEO_FONT_HEIGHT 16
#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT)
#endif /* _VIDEO_FONT_ */ #endif /* _VIDEO_FONT_ */

7
include/video_font_data.h
View File

@ -8,7 +8,12 @@
#ifndef _VIDEO_FONT_DATA_ #ifndef _VIDEO_FONT_DATA_
#define _VIDEO_FONT_DATA_ #define _VIDEO_FONT_DATA_
static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { #define VIDEO_FONT_CHARS 256
#define VIDEO_FONT_WIDTH 8
#define VIDEO_FONT_HEIGHT 16
#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT)
static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */