redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

Remove typedefs from bmp_layout.h 

We try to avoid typedefs and these ones are easy enough to remove. Before
changing this header in the next patch, remove the typedefs.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Joe Hershberger <joe.hershberger@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
utp
Simon Glass 2015-05-13 07:02:27 -06:00
parent 29748515fd
commit 1c3dbe56f7
6 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/cmd_bmp.c
View File

@ -34,12 +34,12 @@ static int bmp_info (ulong addr);
* didn't contain a valid BMP signature. * didn't contain a valid BMP signature.
*/ */
#ifdef CONFIG_VIDEO_BMP_GZIP #ifdef CONFIG_VIDEO_BMP_GZIP
bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp, struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
void **alloc_addr) void **alloc_addr)
{ {
void *dst; void *dst;
unsigned long len; unsigned long len;
bmp_image_t *bmp; struct bmp_image *bmp;
/* /*
* Decompress bmp image * Decompress bmp image
@ -55,7 +55,7 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp,
bmp = dst; bmp = dst;
/* align to 32-bit-aligned-address + 2 */ /* align to 32-bit-aligned-address + 2 */
bmp = (bmp_image_t *)((((unsigned int)dst + 1) & ~3) + 2); bmp = (struct bmp_image *)((((unsigned int)dst + 1) & ~3) + 2);
if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) { if (gunzip(bmp, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) {
free(dst); free(dst);
@ -80,8 +80,8 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp,
return bmp; return bmp;
} }
#else #else
bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp, struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp,
void **alloc_addr) void **alloc_addr)
{ {
return NULL; return NULL;
} }
@ -187,7 +187,7 @@ U_BOOT_CMD(
*/ */
static int bmp_info(ulong addr) static int bmp_info(ulong addr)
{ {
bmp_image_t *bmp=(bmp_image_t *)addr; struct bmp_image *bmp = (struct bmp_image *)addr;
void *bmp_alloc_addr = NULL; void *bmp_alloc_addr = NULL;
unsigned long len; unsigned long len;
@ -224,7 +224,7 @@ static int bmp_info(ulong addr)
int bmp_display(ulong addr, int x, int y) int bmp_display(ulong addr, int x, int y)
{ {
int ret; int ret;
bmp_image_t *bmp = (bmp_image_t *)addr; struct bmp_image *bmp = (struct bmp_image *)addr;
void *bmp_alloc_addr = NULL; void *bmp_alloc_addr = NULL;
unsigned long len; unsigned long len;

10
common/lcd.c
View File

@ -448,8 +448,8 @@ static void draw_encoded_bitmap(ushort **fbp, ushort c, int cnt)
/* /*
* Do not call this function directly, must be called from lcd_display_bitmap. * Do not call this function directly, must be called from lcd_display_bitmap.
*/ */
static void lcd_display_rle8_bitmap(bmp_image_t *bmp, ushort *cmap, uchar *fb, static void lcd_display_rle8_bitmap(struct bmp_image *bmp, ushort *cmap,
int x_off, int y_off) uchar *fb, int x_off, int y_off)
{ {
uchar *bmap; uchar *bmap;
ulong width, height; ulong width, height;
@ -548,10 +548,10 @@ __weak void fb_put_word(uchar **fb, uchar **from)
} }
#endif /* CONFIG_BMP_16BPP */ #endif /* CONFIG_BMP_16BPP */
__weak void lcd_set_cmap(bmp_image_t *bmp, unsigned colors) __weak void lcd_set_cmap(struct bmp_image *bmp, unsigned colors)
{ {
int i; int i;
bmp_color_table_entry_t cte; struct bmp_color_table_entry cte;
ushort *cmap = configuration_get_cmap(); ushort *cmap = configuration_get_cmap();
for (i = 0; i < colors; ++i) { for (i = 0; i < colors; ++i) {
@ -572,7 +572,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
ushort *cmap_base = NULL; ushort *cmap_base = NULL;
ushort i, j; ushort i, j;
uchar *fb; uchar *fb;
bmp_image_t *bmp = (bmp_image_t *)map_sysmem(bmp_image, 0); struct bmp_image *bmp = (struct bmp_image *)map_sysmem(bmp_image, 0);
uchar *bmap; uchar *bmap;
ushort padded_width; ushort padded_width;
unsigned long width, height, byte_width; unsigned long width, height, byte_width;

4
drivers/video/atmel_lcdfb.c
View File

@ -81,12 +81,12 @@ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
#endif #endif
} }
void lcd_set_cmap(bmp_image_t *bmp, unsigned colors) void lcd_set_cmap(struct bmp_image *bmp, unsigned colors)
{ {
int i; int i;
for (i = 0; i < colors; ++i) { for (i = 0; i < colors; ++i) {
bmp_color_table_entry_t cte = bmp->color_table[i]; struct bmp_color_table_entry cte = bmp->color_table[i];
lcd_setcolreg(i, cte.red, cte.green, cte.blue); lcd_setcolreg(i, cte.red, cte.green, cte.blue);
} }
} }

4
drivers/video/bus_vcxk.c
View File

@ -358,7 +358,7 @@ void vcxk_draw_mono(unsigned char *dataptr, unsigned long linewidth,
int vcxk_display_bitmap(ulong addr, int x, int y) int vcxk_display_bitmap(ulong addr, int x, int y)
{ {
bmp_image_t *bmp; struct bmp_image *bmp;
unsigned long width; unsigned long width;
unsigned long height; unsigned long height;
unsigned long bpp; unsigned long bpp;
@ -369,7 +369,7 @@ int vcxk_display_bitmap(ulong addr, int x, int y)
unsigned long c_height; unsigned long c_height;
unsigned char *dataptr; unsigned char *dataptr;
bmp = (bmp_image_t *) addr; bmp = (struct bmp_image *)addr;
if ((bmp->header.signature[0] == 'B') && if ((bmp->header.signature[0] == 'B') &&
(bmp->header.signature[1] == 'M')) { (bmp->header.signature[1] == 'M')) {
width = le32_to_cpu(bmp->header.width); width = le32_to_cpu(bmp->header.width);

10
drivers/video/cfb_console.c
View File

@ -1295,7 +1295,7 @@ static void draw_bitmap(uchar **fb, uchar *bm, struct palette *p,
*fb = (uchar *) addr; /* return modified address */ *fb = (uchar *) addr; /* return modified address */
} }
static int display_rle8_bitmap(bmp_image_t *img, int xoff, int yoff, static int display_rle8_bitmap(struct bmp_image *img, int xoff, int yoff,
int width, int height) int width, int height)
{ {
unsigned char *bm; unsigned char *bm;
@ -1304,7 +1304,7 @@ static int display_rle8_bitmap(bmp_image_t *img, int xoff, int yoff,
int decode = 1; int decode = 1;
int x, y, bpp, i, ncolors; int x, y, bpp, i, ncolors;
struct palette p[256]; struct palette p[256];
bmp_color_table_entry_t cte; struct bmp_color_table_entry cte;
int green_shift, red_off; int green_shift, red_off;
int limit = VIDEO_COLS * VIDEO_ROWS; int limit = VIDEO_COLS * VIDEO_ROWS;
int pixels = 0; int pixels = 0;
@ -1447,13 +1447,13 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
{ {
ushort xcount, ycount; ushort xcount, ycount;
uchar *fb; uchar *fb;
bmp_image_t *bmp = (bmp_image_t *) bmp_image; struct bmp_image *bmp = (struct bmp_image *)bmp_image;
uchar *bmap; uchar *bmap;
ushort padded_line; ushort padded_line;
unsigned long width, height, bpp; unsigned long width, height, bpp;
unsigned colors; unsigned colors;
unsigned long compression; unsigned long compression;
bmp_color_table_entry_t cte; struct bmp_color_table_entry cte;
#ifdef CONFIG_VIDEO_BMP_GZIP #ifdef CONFIG_VIDEO_BMP_GZIP
unsigned char *dst = NULL; unsigned char *dst = NULL;
@ -1495,7 +1495,7 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
/* /*
* Set addr to decompressed image * Set addr to decompressed image
*/ */
bmp = (bmp_image_t *)(dst+2); bmp = (struct bmp_image *)(dst+2);
if (!((bmp->header.signature[0] == 'B') && if (!((bmp->header.signature[0] == 'B') &&
(bmp->header.signature[1] == 'M'))) { (bmp->header.signature[1] == 'M'))) {

17
include/bmp_layout.h
View File

@ -11,17 +11,17 @@
#ifndef _BMP_H_ #ifndef _BMP_H_
#define _BMP_H_ #define _BMP_H_
typedef struct bmp_color_table_entry { struct __packed bmp_color_table_entry {
__u8 blue; __u8 blue;
__u8 green; __u8 green;
__u8 red; __u8 red;
__u8 reserved; __u8 reserved;
} __attribute__ ((packed)) bmp_color_table_entry_t; };
/* When accessing these fields, remember that they are stored in little /* When accessing these fields, remember that they are stored in little
endian format, so use linux macros, e.g. le32_to_cpu(width) */ endian format, so use linux macros, e.g. le32_to_cpu(width) */
typedef struct bmp_header { struct __packed bmp_header {
/* Header */ /* Header */
char signature[2]; char signature[2];
__u32 file_size; __u32 file_size;
@ -40,15 +40,14 @@ typedef struct bmp_header {
__u32 colors_used; __u32 colors_used;
__u32 colors_important; __u32 colors_important;
/* ColorTable */ /* ColorTable */
};
} __attribute__ ((packed)) bmp_header_t; struct bmp_image {
struct bmp_header header;
typedef struct bmp_image {
bmp_header_t header;
/* We use a zero sized array just as a placeholder for variable /* We use a zero sized array just as a placeholder for variable
sized array */ sized array */
bmp_color_table_entry_t color_table[0]; struct bmp_color_table_entry color_table[0];
} bmp_image_t; };
/* Data in the bmp_image is aligned to this length */ /* Data in the bmp_image is aligned to this length */
#define BMP_DATA_ALIGN 4 #define BMP_DATA_ALIGN 4