video: move extern declarations from C to headers
PATCH 1/1 video: move extern declarations from C to headers
From: Alessandro Rubini <[email protected]>
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.
--- common/cmd_bmp.c | 5 +++-- common/lcd.c | 16 ---------------- include/lcd.h | 12 ++++++++++++ 3 files changed, 15 insertions(+), 18 deletions(-)
common/cmd_bmp.c +3 -2
@@ -26,6 +26,7 @@*/ #include <common.h> +#include <lcd.h> #include <bmp_layout.h> #include <command.h> #include <asm/byteorder.h>
@@ -46,7 +47,7 @@ int gunzip(void *, int, unsigned char *, unsigned long *);* didn't contain a valid BMP signature. */ #ifdef CONFIG_VIDEO_BMP_GZIP -static bmp_image_t *gunzip_bmp (unsigned long addr,unsigned long *lenp) +bmp_image_t *gunzip_bmp (unsigned long addr,unsigned long *lenp) {void *dst;unsigned long len;
@@ -85,7 +86,7 @@ static bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) return bmp; }#else -static bmp_image_t *gunzip_bmp (unsigned long addr,unsigned long *lenp) +bmp_image_t *gunzip_bmp (unsigned long addr,unsigned long *lenp) {return NULL ; }
common/lcd.c +0 -16
@@ -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_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 ); - -#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 void lcd_setfgcolor (int color);static void lcd_setbgcolor (int color);char lcd_is_enabled =0 ; -extern vidinfo_t panel_info;#ifdef NOT_USED_SO_FAR static void lcd_getcolreg (ushort regno,
@@ -815,10 +803,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) }#endif -#ifdef CONFIG_VIDEO_BMP_GZIP -extern bmp_image_t *gunzip_bmp (unsigned long addr,unsigned long *lenp); -#endif -static void *lcd_logo (void ) {#ifdef CONFIG_SPLASH_SCREEN
include/lcd.h +12 -0
@@ -43,6 +43,18 @@ extern void *lcd_console_address; /* Start of console buffer */extern short console_col;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 definedCONFIG_MPC823 /*
Signature · 1 line
1.6.0.2
PATCH 1/1 video: move extern declarations from C to headers
Quoted 12 lines · Alessandro Rubini
From: Alessandro Rubini <[email protected]>
This moves some extern declaration from
lcd.ctolcd.h, removing unneeded ifdef around a pair of them. Additionally, sincegunzip_bmp()was declared static incmd_bmp.cbut extern inlcd.c, I removed the static. The extra "#include <lcd.h>" incmd_bmp.cis 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.
Quoted 6 lines
Signed-off-by Alessandro Rubini <[email protected]>--- common/cmd_bmp.c | 5 +++-- common/lcd.c | 16 ---------------- include/lcd.h | 12 ++++++++++++ 3 files changed, 15 insertions(+), 18 deletions(-)
Applied to u-boot-video. Thanks!
Best regards,
Anatolij