From d3983ee85325d2be730830ebcf82585ee7cd2ecb Mon Sep 17 00:00:00 2001 From: Che-Liang Chiou Date: Fri, 21 Oct 2011 17:04:21 +0800 Subject: font: split font data from video_font.h While video_font.h is useful even without referencing the font data, it is not possible to be included multiple times because it defines font data array right in the header. This patch splits the font data array into video_font_data.h and so now video_font.h can be included multiple times. This at least solves the code duplication in board/mcc200/lcd.c. Signed-off-by: Che-Liang Chiou Acked-by: Mike Frysinger --- board/mcc200/lcd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'board/mcc200') diff --git a/board/mcc200/lcd.c b/board/mcc200/lcd.c index 726366d..d8f754c 100644 --- a/board/mcc200/lcd.c +++ b/board/mcc200/lcd.c @@ -55,6 +55,9 @@ #define PSOC_RETRIES 10 /* each of PSOC_WAIT_TIME */ #define PSOC_WAIT_TIME 10 /* usec */ +#include +#define FONT_WIDTH VIDEO_FONT_WIDTH + DECLARE_GLOBAL_DATA_PTR; /* @@ -185,7 +188,6 @@ void lcd_enable (void) } #ifdef CONFIG_PROGRESSBAR -#define FONT_WIDTH 8 /* the same as VIDEO_FONT_WIDTH in video_font.h */ void show_progress (int size, int tot) { int cnt; -- cgit v1.1