dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

common/lcd: cosmetic: clean up a bit

Browse Source 
- Make the brackets of the function calls more consistent
 - Remove really unnecessary brackets
 - Removes the extern from the function definitions
 - Remove curly brackets from single line statements
 - Remove lcd_setmem proto since it is already in common.h
 - Cleanup comments, remove useless comments
 - Remove NOT_USED_SO_FAR ifdef
 - Cleanup coding style

cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
[agust: rebased the original patch]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Jeroen Hofstee
2013-01-12 12:07:56 +00:00
committed by Anatolij Gustschin
parent 00a0ca5986
commit 6b035141f6
2 changed files with 49 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
common/lcd.c
View File

@@ -85,8 +85,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
ulong lcd_setmem (ulong addr);
static void lcd_drawchars(ushort x, ushort y, uchar *str, int count); static void lcd_drawchars(ushort x, ushort y, uchar *str, int count);
static inline void lcd_puts_xy(ushort x, ushort y, uchar *s); static inline void lcd_puts_xy(ushort x, ushort y, uchar *s);
static inline void lcd_putc_xy(ushort x, ushort y, uchar c); static inline void lcd_putc_xy(ushort x, ushort y, uchar c);
@@ -113,13 +111,6 @@ static void *lcd_base; /* Start of framebuffer memory */
static char lcd_flush_dcache; /* 1 to flush dcache after each lcd update */ static char lcd_flush_dcache; /* 1 to flush dcache after each lcd update */
#ifdef NOT_USED_SO_FAR
static void lcd_getcolreg(ushort regno,
ushort *red, ushort *green, ushort *blue);
static int lcd_getfgcolor(void);
#endif /* NOT_USED_SO_FAR */
/************************************************************************/ /************************************************************************/
/* Flush LCD activity to the caches */ /* Flush LCD activity to the caches */
@@ -170,10 +161,9 @@ static inline void console_back(void)
{ {
if (--console_col < 0) { if (--console_col < 0) {
console_col = CONSOLE_COLS-1 ; console_col = CONSOLE_COLS-1 ;
if (--console_row < 0) { if (--console_row < 0)
console_row = 0; console_row = 0;
} }
}
lcd_putc_xy(console_col * VIDEO_FONT_WIDTH, lcd_putc_xy(console_col * VIDEO_FONT_WIDTH,
console_row * VIDEO_FONT_HEIGHT, ' '); console_row * VIDEO_FONT_HEIGHT, ' ');
@@ -183,17 +173,14 @@ static inline void console_back(void)
static inline void console_newline(void) static inline void console_newline(void)
{ {
++console_row;
console_col = 0; console_col = 0;
/* Check if we need to scroll the terminal */ /* Check if we need to scroll the terminal */
if (console_row >= CONSOLE_ROWS) { if (++console_row >= CONSOLE_ROWS)
/* Scroll everything up */
console_scrollup(); console_scrollup();
} else { else
lcd_sync(); lcd_sync();
} }
}
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
@@ -244,9 +231,9 @@ void lcd_puts(const char *s)
return; return;
} }
while (*s) { while (*s)
lcd_putc(*s++); lcd_putc(*s++);
}
lcd_sync(); lcd_sync();
} }
@@ -371,7 +358,7 @@ static void test_pattern(void)
for (v = 0; v < v_max; ++v) { for (v = 0; v < v_max; ++v) {
uchar iy = v / v_step; uchar iy = v / v_step;
for (h = 0; h < h_max; ++h) { for (h = 0; h < h_max; ++h) {
uchar ix = N_BLK_HOR * iy + (h/h_step); uchar ix = N_BLK_HOR * iy + h / h_step;
*pix++ = test_colors[ix]; *pix++ = test_colors[ix];
} }
} }
@@ -394,7 +381,7 @@ int drv_lcd_init (void)
struct stdio_dev lcddev; struct stdio_dev lcddev;
int rc; int rc;
lcd_base = (void *)(gd->fb_base); lcd_base = (void *) gd->fb_base;
lcd_get_size(&lcd_line_length); lcd_get_size(&lcd_line_length);
@@ -523,7 +510,8 @@ ulong lcd_setmem(ulong addr)
/* Allocate pages for the frame buffer. */ /* Allocate pages for the frame buffer. */
addr -= size; addr -= size;
debug("Reserving %ldk for LCD Framebuffer at: %08lx\n", size>>10, addr); debug("Reserving %ldk for LCD Framebuffer at: %08lx\n",
size >> 10, addr);
return addr; return addr;
} }
@@ -556,8 +544,6 @@ static int lcd_getbgcolor(void)
return lcd_color_bg; return lcd_color_bg;
} }
/*----------------------------------------------------------------------*/
/************************************************************************/ /************************************************************************/
/* ** Chipset depending Bitmap / Logo stuff... */ /* ** Chipset depending Bitmap / Logo stuff... */
/************************************************************************/ /************************************************************************/
@@ -574,13 +560,11 @@ static inline ushort *configuration_get_cmap(void)
return (ushort *)(panel_info.mmio + ATMEL_LCDC_LUT(0)); return (ushort *)(panel_info.mmio + ATMEL_LCDC_LUT(0));
#elif !defined(CONFIG_ATMEL_HLCD) && !defined(CONFIG_EXYNOS_FB) #elif !defined(CONFIG_ATMEL_HLCD) && !defined(CONFIG_EXYNOS_FB)
return panel_info.cmap; return panel_info.cmap;
#else #elif defined(CONFIG_LCD_LOGO)
#if defined(CONFIG_LCD_LOGO)
return bmp_logo_palette; return bmp_logo_palette;
#else #else
return NULL; return NULL;
#endif #endif
#endif
} }
#ifdef CONFIG_LCD_LOGO #ifdef CONFIG_LCD_LOGO
@@ -744,12 +728,11 @@ static void draw_encoded_bitmap(ushort **fbp, ushort c, int cnt)
*fb++ = c; *fb++ = c;
cnt--; cnt--;
} }
(*fbp) = fb; *fbp = fb;
} }
/* /*
* Do not call this function directly, must be called from * Do not call this function directly, must be called from lcd_display_bitmap.
* lcd_display_bitmap.
*/ */
static void lcd_display_rle8_bitmap(bmp_image_t *bmp, ushort *cmap, uchar *fb, static void lcd_display_rle8_bitmap(bmp_image_t *bmp, ushort *cmap, uchar *fb,
int x_off, int y_off) int x_off, int y_off)
@@ -876,8 +859,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
unsigned long pwidth = panel_info.vl_col; unsigned long pwidth = panel_info.vl_col;
unsigned colors, bpix, bmp_bpix; unsigned colors, bpix, bmp_bpix;
if (!bmp || !((bmp->header.signature[0] == 'B') && if (!bmp || !(bmp->header.signature[0] == 'B' &&
(bmp->header.signature[1] == 'M'))) { bmp->header.signature[1] == 'M')) {
printf("Error: no valid bmp image at %lx\n", bmp_image); printf("Error: no valid bmp image at %lx\n", bmp_image);
return 1; return 1;
@@ -890,7 +873,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
bpix = NBITS(panel_info.vl_bpix); bpix = NBITS(panel_info.vl_bpix);
if ((bpix != 1) && (bpix != 8) && (bpix != 16) && (bpix != 32)) { if (bpix != 1 && bpix != 8 && bpix != 16 && bpix != 32) {
printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
bpix, bmp_bpix); bpix, bmp_bpix);
@@ -958,7 +941,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
} }
#endif #endif
padded_width = (width&0x3) ? ((width&~0x3)+4) : (width); padded_width = (width & 0x3 ? (width & ~0x3) + 4 : width);
#ifdef CONFIG_SPLASH_SCREEN_ALIGN #ifdef CONFIG_SPLASH_SCREEN_ALIGN
splash_align_axis(&x, pwidth, width); splash_align_axis(&x, pwidth, width);
@@ -1005,7 +988,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
} }
} }
bmap += (padded_width - width); bmap += (padded_width - width);
fb -= (byte_width + lcd_line_length); fb -= byte_width + lcd_line_length;
} }
break; break;
@@ -1017,7 +1000,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
fb_put_word(&fb, &bmap); fb_put_word(&fb, &bmap);
bmap += (padded_width - width) * 2; bmap += (padded_width - width) * 2;
fb -= (width * 2 + lcd_line_length); fb -= width * 2 + lcd_line_length;
} }
break; break;
#endif /* CONFIG_BMP_16BPP */ #endif /* CONFIG_BMP_16BPP */
@@ -1031,7 +1014,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
*(fb++) = *(bmap++); *(fb++) = *(bmap++);
*(fb++) = *(bmap++); *(fb++) = *(bmap++);
} }
fb -= (lcd_line_length + width * (bpix / 8)); fb -= lcd_line_length + width * (bpix / 8);
} }
break; break;
#endif /* CONFIG_BMP_32BPP */ #endif /* CONFIG_BMP_32BPP */
@@ -1106,7 +1089,7 @@ static void *lcd_logo(void)
return (void *)((ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length); return (void *)((ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length);
#else #else
return (void *)lcd_base; return (void *)lcd_base;
#endif /* CONFIG_LCD_LOGO && !CONFIG_LCD_INFO_BELOW_LOGO */ #endif /* CONFIG_LCD_LOGO && !defined(CONFIG_LCD_INFO_BELOW_LOGO) */
} }
#ifdef CONFIG_SPLASHIMAGE_GUARD #ifdef CONFIG_SPLASHIMAGE_GUARD
@@ -1158,6 +1141,3 @@ int lcd_get_screen_columns(void)
{ {
return CONSOLE_COLS; return CONSOLE_COLS;
} }
/************************************************************************/
/************************************************************************/

28
include/lcd.h
View File

@@ -35,20 +35,19 @@ extern int lcd_line_length;
extern struct vidinfo panel_info; extern struct vidinfo panel_info;
extern void lcd_ctrl_init (void *lcdbase); void lcd_ctrl_init(void *lcdbase);
extern void lcd_enable (void); void lcd_enable(void);
extern int board_splash_screen_prepare(void); int board_splash_screen_prepare(void);
/* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */ /* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */
extern void lcd_setcolreg (ushort regno, void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue);
ushort red, ushort green, ushort blue); void lcd_initcolregs(void);
extern void lcd_initcolregs (void);
extern int lcd_getfgcolor(void); int lcd_getfgcolor(void);
/* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */ /* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */
extern struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp); struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp);
extern int bmp_display(ulong addr, int x, int y); int bmp_display(ulong addr, int x, int y);
/** /**
* Set whether we need to flush the dcache when changing the LCD image. This * Set whether we need to flush the dcache when changing the LCD image. This
@@ -259,7 +258,6 @@ typedef struct vidinfo {
unsigned int sclk_div; unsigned int sclk_div;
unsigned int dual_lcd_enabled; unsigned int dual_lcd_enabled;
} vidinfo_t; } vidinfo_t;
void init_panel_info(vidinfo_t *vid); void init_panel_info(vidinfo_t *vid);
@@ -287,8 +285,6 @@ extern vidinfo_t panel_info;
void lcd_disable(void); void lcd_disable(void);
#endif #endif
/* int lcd_init (void *lcdbase); */
void lcd_putc(const char c); void lcd_putc(const char c);
void lcd_puts(const char *s); void lcd_puts(const char *s);
void lcd_printf(const char *fmt, ...); void lcd_printf(const char *fmt, ...);
@@ -365,10 +361,10 @@ int lcd_get_size(int *line_length);
# define LCD_INFO_Y (BMP_LOGO_HEIGHT + VIDEO_FONT_HEIGHT) # define LCD_INFO_Y (BMP_LOGO_HEIGHT + VIDEO_FONT_HEIGHT)
#elif defined(CONFIG_LCD_LOGO) #elif defined(CONFIG_LCD_LOGO)
# define LCD_INFO_X (BMP_LOGO_WIDTH + 4 * VIDEO_FONT_WIDTH) # define LCD_INFO_X (BMP_LOGO_WIDTH + 4 * VIDEO_FONT_WIDTH)
# define LCD_INFO_Y (VIDEO_FONT_HEIGHT) # define LCD_INFO_Y VIDEO_FONT_HEIGHT
#else #else
# define LCD_INFO_X (VIDEO_FONT_WIDTH) # define LCD_INFO_X VIDEO_FONT_WIDTH
# define LCD_INFO_Y (VIDEO_FONT_HEIGHT) # define LCD_INFO_Y VIDEO_FONT_HEIGHT
#endif #endif
/* Default to 8bpp if bit depth not specified */ /* Default to 8bpp if bit depth not specified */
@@ -436,7 +432,7 @@ int lcd_get_size(int *line_length);
#define CONSOLE_COLS (panel_info.vl_col / VIDEO_FONT_WIDTH) #define CONSOLE_COLS (panel_info.vl_col / VIDEO_FONT_WIDTH)
#define CONSOLE_ROW_SIZE (VIDEO_FONT_HEIGHT * lcd_line_length) #define CONSOLE_ROW_SIZE (VIDEO_FONT_HEIGHT * lcd_line_length)
#define CONSOLE_ROW_FIRST (lcd_console_address) #define CONSOLE_ROW_FIRST lcd_console_address
#define CONSOLE_ROW_SECOND (lcd_console_address + CONSOLE_ROW_SIZE) #define CONSOLE_ROW_SECOND (lcd_console_address + CONSOLE_ROW_SIZE)
#define CONSOLE_ROW_LAST (lcd_console_address + CONSOLE_SIZE \ #define CONSOLE_ROW_LAST (lcd_console_address + CONSOLE_SIZE \
- CONSOLE_ROW_SIZE) - CONSOLE_ROW_SIZE)