diff --git a/commands/Kconfig b/commands/Kconfig index de87c8d..a91bcef 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -265,4 +265,11 @@ depends on MODULES prompt "lsmod" +config CMD_BMP + bool + depends on VIDEO + prompt "bmp" + help + show bmp files on framebuffer devices + endmenu diff --git a/commands/Makefile b/commands/Makefile index 93c6410..058a5fe 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -45,3 +45,4 @@ obj-$(CONFIG_CMD_HELP) += help.o obj-$(CONFIG_CMD_LSMOD) += lsmod.o obj-$(CONFIG_CMD_INSMOD) += insmod.o +obj-$(CONFIG_CMD_BMP) += bmp.o diff --git a/commands/bmp.c b/commands/bmp.c new file mode 100644 index 0000000..b7b7c9f --- /dev/null +++ b/commands/bmp.c @@ -0,0 +1,212 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static inline void set_pixel(struct fb_info *info, void *adr, int r, int g, int b) +{ + u32 px; + + px = (r >> (8 - info->red.length)) << info->red.offset | + (g >> (8 - info->green.length)) << info->green.offset | + (b >> (8 - info->blue.length)) << info->blue.offset; + + switch (info->bits_per_pixel) { + case 8: + break; + case 16: + *(u16 *)adr = px; + break; + case 32: + break; + } +} + +static int do_bmp(cmd_tbl_t *cmdtp, int argc, char *argv[]) +{ + int ret, opt, fd; + char *fbdev = "/dev/fb0"; + void *fb, *offscreenbuf = NULL; + struct fb_info info; + struct bmp_image *bmp; + char *bmpfile; + int bmpsize; + char *image; + int sw, sh, width, height, startx = -1, starty = -1; + int bits_per_pixel, fbsize; + int xres, yres; + int offscreen = 0; + void *adr, *buf; + + getopt_reset(); + + while((opt = getopt(argc, argv, "f:x:y:o")) > 0) { + switch(opt) { + case 'f': + fbdev = optarg; + break; + case 'x': + startx = simple_strtoul(optarg, NULL, 0); + break; + case 'y': + starty = simple_strtoul(optarg, NULL, 0); + case 'o': + offscreen = 1; + } + } + + if (optind == argc) { + printf("no filename given\n"); + return 1; + } + bmpfile = argv[optind]; + + fd = open(fbdev, O_RDWR); + if (fd < 0) { + perror("open"); + return 1; + } + + fb = memmap(fd, PROT_READ | PROT_WRITE); + if (fb == (void *)-1) { + perror("memmap"); + goto failed_memmap; + } + + ret = ioctl(fd, FBIOGET_SCREENINFO, &info); + if (ret) { + perror("ioctl"); + goto failed_memmap; + } + + xres = info.xres; + yres = info.yres; + + bmp = read_file(bmpfile, &bmpsize); + if (!bmp) { + printf("unable to read %s\n", bmpfile); + goto failed_memmap; + } + + if (bmp->header.signature[0] != 'B' || + bmp->header.signature[1] != 'M') { + printf("No valid bmp file\n"); + } + + sw = le32_to_cpu(bmp->header.width); + sh = le32_to_cpu(bmp->header.height); + + if (startx < 0) { + startx = (xres - sw) / 2; + if (startx < 0) + startx = 0; + } + + if (starty < 0) { + starty = (yres - sh) / 2; + if (starty < 0) + starty = 0; + } + + width = min(sw, xres - startx); + height = min(sh, yres - starty); + + bits_per_pixel = le16_to_cpu(bmp->header.bit_count); + fbsize = xres * yres * (info.bits_per_pixel >> 3); + + if (offscreen) { + /* Don't fail if malloc fails, just continue rendering directly + * on the framebuffer + */ + offscreenbuf = malloc(fbsize); + if (offscreenbuf) + memcpy(offscreenbuf, fb, fbsize); + } + + buf = offscreenbuf ? offscreenbuf : fb; + + if (bits_per_pixel == 8) { + int x, y; + struct bmp_color_table_entry *color_table = bmp->color_table; + + for (y = 0; y < height; y++) { + image = (char *)bmp + + le32_to_cpu(bmp->header.data_offset); + image += (sh - y - 1) * sw * (bits_per_pixel >> 3); + adr = buf + ((y + starty) * xres + startx) * + (info.bits_per_pixel >> 3); + for (x = 0; x < width; x++) { + int pixel; + + pixel = *image; + + set_pixel(&info, adr, color_table[pixel].red, + color_table[pixel].green, + color_table[pixel].blue); + adr += info.bits_per_pixel >> 3; + + image += bits_per_pixel >> 3; + } + } + } else if (bits_per_pixel == 24) { + int x, y; + + for (y = 0; y < height; y++) { + image = (char *)bmp + + le32_to_cpu(bmp->header.data_offset); + image += (sh - y - 1) * sw * (bits_per_pixel >> 3); + adr = buf + ((y + starty) * xres + startx) * + (info.bits_per_pixel >> 3); + for (x = 0; x < width; x++) { + char *pixel; + + pixel = image; + + set_pixel(&info, adr, pixel[2], pixel[1], + pixel[0]); + adr += info.bits_per_pixel >> 3; + + image += bits_per_pixel >> 3; + } + } + } else + printf("bmp: illegal bits per pixel value: %d\n", bits_per_pixel); + + if (offscreenbuf) { + memcpy(fb, offscreenbuf, fbsize); + free(offscreenbuf); + } + + free(bmp); + close(fd); + + return 0; + +failed_memmap: + close(fd); + + return 1; +} + +static const __maybe_unused char cmd_bmp_help[] = +"Usage: bmp [OPTION]... FILE\n" +"show bmp image FILE.\n" +" -f framebuffer device (/dev/fb0)\n" +" -x x offset (default center)\n" +" -y y offset (default center)\n" +" -o render offscreen\n"; + +U_BOOT_CMD_START(bmp) + .maxargs = CONFIG_MAXARGS, + .cmd = do_bmp, + .usage = "show a bmp image", + U_BOOT_CMD_HELP(cmd_bmp_help) +U_BOOT_CMD_END + diff --git a/include/bmp_layout.h b/include/bmp_layout.h index d823de9..63c5564 100644 --- a/include/bmp_layout.h +++ b/include/bmp_layout.h @@ -27,17 +27,17 @@ #ifndef _BMP_H_ #define _BMP_H_ -typedef struct bmp_color_table_entry { +struct bmp_color_table_entry { __u8 blue; __u8 green; __u8 red; __u8 reserved; -} __attribute__ ((packed)) bmp_color_table_entry_t; +} __attribute__ ((packed)); /* When accessing these fields, remember that they are stored in little endian format, so use linux macros, e.g. le32_to_cpu(width) */ -typedef struct bmp_header { +struct bmp_header { /* Header */ char signature[2]; __u32 file_size; @@ -57,14 +57,14 @@ __u32 colors_important; /* ColorTable */ -} __attribute__ ((packed)) bmp_header_t; +} __attribute__ ((packed)); -typedef struct bmp_image { - bmp_header_t header; +struct bmp_image { + struct bmp_header header; /* We use a zero sized array just as a placeholder for variable sized array */ - bmp_color_table_entry_t color_table[0]; -} bmp_image_t; + struct bmp_color_table_entry color_table[0]; +}; /* Data in the bmp_image is aligned to this length */ #define BMP_DATA_ALIGN 4