Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

video: move extern declarations from C to headers

Browse source 
This moves some extern declaration from lcd.c to lcd.h, removing
unneeded ifdef around a pair of them.  Additionally, since
gunzip_bmp() was declared static in cmd_bmp.c but extern in lcd.c, I
removed the static.  The extra "#include <lcd.h>" in cmd_bmp.c is
added to ensure the header is consistent with the source.

This has been compile-tested on both ARM (at91 boards) and PowerPC
(HH405_config, TQM823L_LCD_config, mcc200_config), to test all use
combinations.

Signed-off-by: Alessandro Rubini <rubini@gnudd.it>
[agust@denx.de: removed gunzip_bmp() fixes as commit c01171ea did it]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Alessandro Rubini 2009-07-19 17:52:27 +02:00 committed by Anatolij Gustschin
parent f33b325af6
commit 6111722a92
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/cmd_bmp.c
View file

@ -26,6 +26,7 @@
*/ */
#include <common.h> #include <common.h>
#include <lcd.h>
#include <bmp_layout.h> #include <bmp_layout.h>
#include <command.h> #include <command.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>

16
common/lcd.c
View file

@ -79,25 +79,13 @@ static inline void lcd_putc_xy (ushort x, ushort y, uchar c);
static int lcd_init (void *lcdbase); static int lcd_init (void *lcdbase);
static int lcd_clear (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]); static int lcd_clear (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
extern void lcd_ctrl_init (void *lcdbase);
extern void lcd_enable (void);
static void *lcd_logo (void); static void *lcd_logo (void);
#if (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16)
extern void lcd_setcolreg (ushort regno,
ushort red, ushort green, ushort blue);
#endif
#if LCD_BPP == LCD_MONOCHROME
extern void lcd_initcolregs (void);
#endif
static int lcd_getbgcolor (void); static int lcd_getbgcolor (void);
static void lcd_setfgcolor (int color); static void lcd_setfgcolor (int color);
static void lcd_setbgcolor (int color); static void lcd_setbgcolor (int color);
char lcd_is_enabled = 0; char lcd_is_enabled = 0;
extern vidinfo_t panel_info;
#ifdef NOT_USED_SO_FAR #ifdef NOT_USED_SO_FAR
static void lcd_getcolreg (ushort regno, static void lcd_getcolreg (ushort regno,
@ -815,10 +803,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
} }
#endif #endif
#ifdef CONFIG_VIDEO_BMP_GZIP
extern bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp);
#endif
static void *lcd_logo (void) static void *lcd_logo (void)
{ {
#ifdef CONFIG_SPLASH_SCREEN #ifdef CONFIG_SPLASH_SCREEN

12
include/lcd.h
View file

@ -43,6 +43,18 @@ extern void *lcd_console_address; /* Start of console buffer */
extern short console_col; extern short console_col;
extern short console_row; extern short console_row;
extern struct vidinfo panel_info;
extern void lcd_ctrl_init (void *lcdbase);
extern void lcd_enable (void);
/* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */
extern void lcd_setcolreg (ushort regno,
ushort red, ushort green, ushort blue);
extern void lcd_initcolregs (void);
/* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */
extern struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp);
#if defined CONFIG_MPC823 #if defined CONFIG_MPC823
/* /*