by Wayne Xia
added an option to let seabios show BMP file as a logo.
Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com>
---
Makefile | 4 +-
src/bmp.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/bmp.h | 25 +++++++++++++
src/bootsplash.c | 105 ++++++++++++++++++++++++++++++++++++++++-------------
4 files changed, 211 insertions(+), 28 deletions(-)
create mode 100644 src/bmp.c
create mode 100644 src/bmp.h
diff --git a/Makefile b/Makefile
index a96c89d..2786c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \
kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \
pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \
usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \
- virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c
+ virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c bmp.c
SRC16=$(SRCBOTH) system.c disk.c font.c
SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \
- pci_region.c biostables.c xen.c
+ pci_region.c biostables.c xen.c bmp.c
SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c
cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
diff --git a/src/bmp.c b/src/bmp.c
new file mode 100644
index 0000000..53da8e4
--- /dev/null
+++ b/src/bmp.c
@@ -0,0 +1,105 @@
+/*
+* Basic BMP data process and Raw picture data handle functions.
+* Could be used to adjust pixel data format, get infomation, etc.
+*
+* Copyright (C) 2011 Wayne Xia <xiawenc(a)cn.ibm.com>
+*
+* This work is licensed under the terms of the GNU LGPLv3.
+*/
+#include "util.h"
+#include "bmp.h"
+
+#define bmp_load4byte(addr) (*(u32 *)(addr))
+#define bmp_load2byte(addr) (*(u16 *)(addr))
+
+typedef struct tagBITMAPFILEHEADER {
+ u8 bfType[2];
+ u8 bfSize[4];
+ u8 bfReserved1[2];
+ u8 bfReserved2[2];
+ u8 bfOffBits[4];
+} BITMAPFILEHEADER, tagBITMAPFILEHEADER;
+
+typedef struct tagBITMAPINFOHEADER {
+ u8 biSize[4];
+ u8 biWidth[4];
+ u8 biHeight[4];
+ u8 biPlanes[2];
+ u8 biBitCount[2];
+ u8 biCompression[4];
+ u8 biSizeImage[4];
+ u8 biXPelsPerMeter[4];
+ u8 biYPelsPerMeter[4];
+ u8 biClrUsed[4];
+ u8 biClrImportant[4];
+} BITMAPINFOHEADER, tagBITMAPINFOHEADER;
+
+typedef struct tagRGBQUAD {
+ u8 rgbBlue;
+ u8 rgbGreen;
+ u8 rgbRed;
+ u8 rgbReserved;
+} RGBQUAD, tagRGBQUAD;
+
+/* flat picture data adjusting function
+* description:
+* switch the vertical line sequence
+* arrange horizontal pixel data, add extra space in the dest buffer
+* for every line
+*/
+static void raw_data_format_adjust_24bpp(u8 *src, u8 *dest, int width,
+ int height, int bytes_per_line_dest)
+{
+ int bytes_per_line_src = 3 * width;
+ int i;
+ for (i = 0 ; i < height ; i++) {
+ memcpy(dest + i * bytes_per_line_dest,
+ src + (height - 1 - i) * bytes_per_line_src, bytes_per_line_src);
+ }
+}
+
+struct bmp_decdata *bmp_alloc(void)
+{
+ struct bmp_decdata *bmp = malloc_tmphigh(sizeof(*bmp));
+ return bmp;
+}
+
+int bmp_decode(struct bmp_decdata *bmp, unsigned char *data, int data_size)
+{
+ if (data_size < 54)
+ return 1;
+
+ u16 bmp_filehead = bmp_load2byte(data + 0);
+ if (bmp_filehead != 0x4d42)
+ return 2;
+ u32 bmp_recordsize = bmp_load4byte(data + 2);
+ if (bmp_recordsize != data_size)
+ return 3;
+ u32 bmp_dataoffset = bmp_load4byte(data + 10);
+ bmp->datap = (unsigned char *)data + bmp_dataoffset;
+ bmp->width = bmp_load4byte(data + 18);
+ bmp->height = bmp_load4byte(data + 22);
+ bmp->bpp = bmp_load2byte(data + 28);
+ return 0;
+}
+
+void bmp_get_size(struct bmp_decdata *bmp, int *width, int *height)
+{
+ *width = bmp->width;
+ *height = bmp->height;
+}
+
+
+int bmp_show(struct bmp_decdata *bmp, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest)
+{
+ if (bmp->datap == pic)
+ return 0;
+ /* now only support 24bpp bmp file */
+ if ((depth == 24) && (bmp->bpp == 24)) {
+ raw_data_format_adjust_24bpp(bmp->datap, pic, width, height,
+ bytes_per_line_dest);
+ return 0;
+ }
+ return 1;
+}
diff --git a/src/bmp.h b/src/bmp.h
new file mode 100644
index 0000000..7ae8e87
--- /dev/null
+++ b/src/bmp.h
@@ -0,0 +1,25 @@
+#ifndef BMP_H
+#define BMP_H
+#include "types.h"
+
+struct bmp_decdata {
+ struct tagRGBQUAD *quadp;
+ unsigned char *datap;
+ int width;
+ int height;
+ int bpp;
+};
+
+/* allocate decdata struct */
+struct bmp_decdata *bmp_alloc(void);
+
+/* extract information from bmp file data */
+int bmp_decode(struct bmp_decdata *bmp, unsigned char *data, int data_size);
+
+/* get bmp properties */
+void bmp_get_size(struct bmp_decdata *bmp, int *width, int *height);
+
+/* flush flat picture data to *pc */
+int bmp_show(struct bmp_decdata *bmp, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest);
+#endif
diff --git a/src/bootsplash.c b/src/bootsplash.c
index cf1a603..51f4f4f 100644
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -12,7 +12,7 @@
#include "jpeg.h" // splash
#include "biosvar.h" // SET_EBDA
#include "paravirt.h" // romfile_find
-
+#include "bmp.h"
/****************************************************************
* VESA structures
@@ -109,7 +109,7 @@ enable_vga_console(void)
static int
find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info
- , int width, int height)
+ , int width, int height, int bpp_req)
{
dprintf(3, "Finding vesa mode with dimensions %d/%d\n", width, height);
u16 *videomodes = SEGOFF_TO_FLATPTR(vesa_info->video_mode_ptr);
@@ -135,8 +135,13 @@ find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info
|| mode_info->y_resolution != height)
continue;
u8 depth = mode_info->bits_per_pixel;
- if (depth != 16 && depth != 24 && depth != 32)
- continue;
+ if (bpp_req == 0) {
+ if (depth != 16 && depth != 24 && depth != 32)
+ continue;
+ } else {
+ if (depth != bpp_req)
+ continue;
+ }
return videomode;
}
}
@@ -148,17 +153,25 @@ enable_bootsplash(void)
{
if (!CONFIG_BOOTSPLASH)
return;
+ /* splash picture can be bmp or jpeg file */
dprintf(3, "Checking for bootsplash\n");
+ u8 type = 0; /* 0 means jpg, 1 means bmp, default is 0=jpg */
int filesize;
u8 *filedata = romfile_loadfile("bootsplash.jpg", &filesize);
- if (!filedata)
- return;
+ if (!filedata) {
+ filedata = romfile_loadfile("bootsplash.bmp", &filesize);
+ if (!filedata)
+ return;
+ type = 1;
+ }
+ dprintf(3, "start showing bootsplash\n");
- u8 *picture = NULL;
+ u8 *picture = NULL; /* data buff used to be flushed to the video buf */
+ struct jpeg_decdata *jpeg = NULL;
+ struct bmp_decdata *bmp = NULL;
struct vesa_info *vesa_info = malloc_tmplow(sizeof(*vesa_info));
struct vesa_mode_info *mode_info = malloc_tmplow(sizeof(*mode_info));
- struct jpeg_decdata *jpeg = jpeg_alloc();
- if (!jpeg || !vesa_info || !mode_info) {
+ if (!vesa_info || !mode_info) {
warn_noalloc();
goto done;
}
@@ -184,20 +197,48 @@ enable_bootsplash(void)
vesa_info->vesa_version>>8, vesa_info->vesa_version&0xff,
vendor, product);
- // Parse jpeg and get image size.
- dprintf(5, "Decoding bootsplash.jpg\n");
- int ret = jpeg_decode(jpeg, filedata);
- if (ret) {
- dprintf(1, "jpeg_decode failed with return code %d...\n", ret);
- goto done;
+ int ret, width, height;
+ int bpp_require = 0;
+ if (type == 0) {
+ jpeg = jpeg_alloc();
+ if (!jpeg) {
+ warn_noalloc();
+ goto done;
+ }
+ /* Parse jpeg and get image size. */
+ dprintf(5, "Decoding bootsplash.jpg\n");
+ ret = jpeg_decode(jpeg, filedata);
+ if (ret) {
+ dprintf(1, "jpeg_decode failed with return code %d...\n", ret);
+ goto done;
+ }
+ jpeg_get_size(jpeg, &width, &height);
+ } else {
+ bmp = bmp_alloc();
+ if (!bmp) {
+ warn_noalloc();
+ goto done;
+ }
+ /* Parse bmp and get image size. */
+ dprintf(5, "Decoding bootsplash.bmp\n");
+ ret = bmp_decode(bmp, filedata, filesize);
+ if (ret) {
+ dprintf(1, "bmp_decode failed with return code %d...\n", ret);
+ goto done;
+ }
+ bmp_get_size(bmp, &width, &height);
+ bpp_require = 24;
}
- int width, height;
- jpeg_get_size(jpeg, &width, &height);
+ /* jpeg would use 16 or 24 bpp video mode, BMP use 24bpp mode only */
// Try to find a graphics mode with the corresponding dimensions.
- int videomode = find_videomode(vesa_info, mode_info, width, height);
- if (videomode < 0)
+ int videomode = find_videomode(vesa_info, mode_info, width, height,
+ bpp_require);
+ if (videomode < 0) {
+ dprintf(1, "failed to find a videomode with %dx%d %dbpp (0=any).\n",
+ width, height, bpp_require);
goto done;
+ }
void *framebuffer = mode_info->phys_base_ptr;
int depth = mode_info->bits_per_pixel;
dprintf(3, "mode: %04x\n", videomode);
@@ -206,17 +247,28 @@ enable_bootsplash(void)
dprintf(3, "bits per pixel: %d\n", depth);
// Allocate space for image and decompress it.
- int imagesize = width * height * (depth / 8);
+ int imagesize = height * mode_info->bytes_per_scanline;
picture = malloc_tmphigh(imagesize);
if (!picture) {
warn_noalloc();
goto done;
}
- dprintf(5, "Decompressing bootsplash.jpg\n");
- ret = jpeg_show(jpeg, picture, width, height, depth);
- if (ret) {
- dprintf(1, "jpeg_show failed with return code %d...\n", ret);
- goto done;
+
+ if (type == 0) {
+ dprintf(5, "Decompressing bootsplash.jpg\n");
+ ret = jpeg_show(jpeg, picture, width, height, depth);
+ if (ret) {
+ dprintf(1, "jpeg_show failed with return code %d...\n", ret);
+ goto done;
+ }
+ } else {
+ dprintf(5, "Decompressing bootsplash.bmp\n");
+ ret = bmp_show(bmp, picture, width, height, depth,
+ mode_info->bytes_per_scanline);
+ if (ret) {
+ dprintf(1, "bmp_show failed with return code %d...\n", ret);
+ goto done;
+ }
}
/* Switch to graphics mode */
@@ -231,7 +283,7 @@ enable_bootsplash(void)
}
/* Show the picture */
- dprintf(5, "Showing bootsplash.jpg\n");
+ dprintf(5, "Showing bootsplash picture\n");
iomemcpy(framebuffer, picture, imagesize);
dprintf(5, "Bootsplash copy complete\n");
BootsplashActive = 1;
@@ -242,6 +294,7 @@ done:
free(vesa_info);
free(mode_info);
free(jpeg);
+ free(bmp);
return;
}
--
1.7.6.rc1.1.g2c162b
by Gerd Hoffmann
Hi,
Next round of the two-pass initialization patches,
addressing the review comments from Kevin.
cheers,
Gerd
Gerd Hoffmann (6):
pci: add two-pass pci initialization code
pci: activate two-pass pci initialization code
pci: remove old pci initilaization code
pci: init boot devices only on address space shortage
pci: cleanup config.h
pci: set BUILD_PCIMEM_START to 0xe0000000
Makefile | 2 +-
src/config.h | 16 +--
src/pci.c | 3 +
src/pci.h | 8 +
src/pci_region.c | 77 --------
src/pciinit.c | 537 ++++++++++++++++++++++++++++++++++++------------------
src/util.h | 31 +---
7 files changed, 377 insertions(+), 297 deletions(-)
delete mode 100644 src/pci_region.c
by Wayne Xia
fix the jpeg decoder problem emerged when it was used in 24 BPP mode.
Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com>
---
src/bootsplash.c | 3 ++-
src/jpeg.c | 31 ++++++++++++++++++++++---------
src/jpeg.h | 4 ++--
3 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/bootsplash.c b/src/bootsplash.c
index 6ddfae8..265f3f8 100644
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -256,7 +256,8 @@ enable_bootsplash(void)
if (type == 0) {
dprintf(5, "Decompressing bootsplash.jpg\n");
- ret = jpeg_show(jpeg, picture, width, height, depth);
+ ret = jpeg_show(jpeg, picture, width, height, depth,
+ mode_info->bytes_per_scanline);
if (ret) {
dprintf(1, "jpeg_show failed with return code %d...\n", ret);
goto done;
diff --git a/src/jpeg.c b/src/jpeg.c
index 1068291..a96a9d7 100644
--- a/src/jpeg.c
+++ b/src/jpeg.c
@@ -394,10 +394,10 @@ void jpeg_get_size(struct jpeg_decdata *jpeg, int *width, int *height)
*height = jpeg->height;
}
-int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
- , int width, int height, int depth)
+int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest)
{
- int m, mcusx, mcusy, mx, my;
+ int m, mcusx, mcusy, mx, my, mloffset, jpgbpl;
int max[6];
if (jpeg->height != height)
@@ -405,6 +405,9 @@ int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
if (jpeg->width != width)
return ERR_WIDTH_MISMATCH;
+ jpgbpl = width * depth / 8;
+ mloffset = bytes_per_line_dest > jpgbpl ? bytes_per_line_dest : jpgbpl;
+
mcusx = jpeg->width >> 4;
mcusy = jpeg->height >> 4;
@@ -434,18 +437,18 @@ int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
switch (depth) {
case 32:
col221111_32(jpeg->out,
- pic + (my * 16 * mcusx + mx) * 16 * 4,
- mcusx * 16 * 4);
+ pic + (my * 16 * mloffset + mx * 16 * 4),
+ mloffset);
break;
case 24:
col221111(jpeg->out,
- pic + (my * 16 * mcusx + mx) * 16 * 3,
- mcusx * 16 * 3);
+ pic + (my * 16 * mloffset + mx * 16 * 3),
+ mloffset);
break;
case 16:
col221111_16(jpeg->out,
- pic + (my * 16 * mcusx + mx) * (16 * 2),
- mcusx * (16 * 2));
+ pic + (my * 16 * mloffset + mx * 16 * 2),
+ mloffset);
break;
default:
return ERR_DEPTH_MISMATCH;
@@ -887,6 +890,15 @@ static void initcol(PREC q[][64])
#endif
+#ifdef __LITTLE_ENDIAN
+#define PIC(yin, xin, p, xout) \
+( \
+ y = outy[(yin) * 8 + xin], \
+ STORECLAMP(p[(xout) * 3 + 2], y + cr), \
+ STORECLAMP(p[(xout) * 3 + 1], y - cg), \
+ STORECLAMP(p[(xout) * 3 + 0], y + cb) \
+)
+#else
#define PIC(yin, xin, p, xout) \
( \
y = outy[(yin) * 8 + xin], \
@@ -894,6 +906,7 @@ static void initcol(PREC q[][64])
STORECLAMP(p[(xout) * 3 + 1], y - cg), \
STORECLAMP(p[(xout) * 3 + 2], y + cb) \
)
+#endif
#ifdef __LITTLE_ENDIAN
#define PIC_16(yin, xin, p, xout, add) \
diff --git a/src/jpeg.h b/src/jpeg.h
index a2ac501..2d08f45 100644
--- a/src/jpeg.h
+++ b/src/jpeg.h
@@ -5,7 +5,7 @@ struct jpeg_decdata;
struct jpeg_decdata *jpeg_alloc(void);
int jpeg_decode(struct jpeg_decdata *jpeg, unsigned char *buf);
void jpeg_get_size(struct jpeg_decdata *jpeg, int *width, int *height);
-int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
- , int width, int height, int depth);
+int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest);
#endif
--
1.7.6.rc1.1.g2c162b
by Wayne Xia
added an option to let seabios show BMP file as a logo.
Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com>
---
Makefile | 4 +-
src/bmp.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/bmp.h | 25 ++++++++++++
src/bootsplash.c | 109 ++++++++++++++++++++++++++++++++++++++------------
4 files changed, 225 insertions(+), 29 deletions(-)
create mode 100644 src/bmp.c
create mode 100644 src/bmp.h
diff --git a/Makefile b/Makefile
index a96c89d..2786c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \
kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \
pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \
usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \
- virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c
+ virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c bmp.c
SRC16=$(SRCBOTH) system.c disk.c font.c
SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \
- pci_region.c biostables.c xen.c
+ pci_region.c biostables.c xen.c bmp.c
SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c
cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
diff --git a/src/bmp.c b/src/bmp.c
new file mode 100644
index 0000000..ab96f9b
--- /dev/null
+++ b/src/bmp.c
@@ -0,0 +1,116 @@
+/*
+* Basic BMP data process and Raw picture data handle functions.
+* Could be used to adjust pixel data format, get infomation, etc.
+*
+* Copyright (C) 2011 Wayne Xia <xiawenc(a)cn.ibm.com>
+*
+* This work is licensed under the terms of the GNU LGPLv3.
+*/
+#include "util.h"
+#include "bmp.h"
+
+#define bmp_load4byte(addr) (*(u32 *)(addr))
+#define bmp_load2byte(addr) (*(u16 *)(addr))
+
+typedef struct tagBITMAPFILEHEADER {
+ u8 bfType[2];
+ u8 bfSize[4];
+ u8 bfReserved1[2];
+ u8 bfReserved2[2];
+ u8 bfOffBits[4];
+} BITMAPFILEHEADER, tagBITMAPFILEHEADER;
+
+typedef struct tagBITMAPINFOHEADER {
+ u8 biSize[4];
+ u8 biWidth[4];
+ u8 biHeight[4];
+ u8 biPlanes[2];
+ u8 biBitCount[2];
+ u8 biCompression[4];
+ u8 biSizeImage[4];
+ u8 biXPelsPerMeter[4];
+ u8 biYPelsPerMeter[4];
+ u8 biClrUsed[4];
+ u8 biClrImportant[4];
+} BITMAPINFOHEADER, tagBITMAPINFOHEADER;
+
+typedef struct tagRGBQUAD {
+ u8 rgbBlue;
+ u8 rgbGreen;
+ u8 rgbRed;
+ u8 rgbReserved;
+} RGBQUAD, tagRGBQUAD;
+
+/* flat picture data adjusting function
+* description:
+* switch the vertical line sequence if flag is on
+* arrange horizontal pixel data, add extra space in the dest buffer
+* for every line
+*/
+static void raw_data_format_adjust_24bpp(u8 *src, u8 *dest, int width,
+ int height, int bytes_per_line_dest)
+{
+ int cy = height;
+ u8 *pd, *ps, *pd_valid, *ps_lastline;
+ int bytes_per_line_src = 3 * width;
+ while (cy > 0) {
+ ps = bytes_per_line_src*cy + src - 1;
+ /* verical line sequence reverse */
+ pd = bytes_per_line_dest * (height - cy + 1) + dest - 1;
+ ps_lastline = ps - bytes_per_line_src;
+ pd_valid = pd - (bytes_per_line_dest - bytes_per_line_src);
+ while (pd > pd_valid) {
+ *(pd--) = 0;
+ }
+ while (ps > ps_lastline) {
+ *(pd--) = *(ps--);
+ }
+ cy--;
+ }
+}
+
+struct bmp_decdata *bmp_alloc(void)
+{
+ struct bmp_decdata *bmp = malloc_tmphigh(sizeof(*bmp));
+ return bmp;
+}
+
+int bmp_decode(struct bmp_decdata *bmp, unsigned char *data, int data_size)
+{
+ if (data_size < 54)
+ return 1;
+
+ u16 bmp_filehead = bmp_load2byte(data + 0);
+ if (bmp_filehead != 0x4d42)
+ return 2;
+ u32 bmp_recordsize = bmp_load4byte(data + 2);
+ if (bmp_recordsize != data_size)
+ return 3;
+ u32 bmp_dataoffset = bmp_load4byte(data + 10);
+ bmp->datap = (unsigned char *)data + bmp_dataoffset;
+ bmp->width = bmp_load4byte(data + 18);
+ bmp->height = bmp_load4byte(data + 22);
+ bmp->bpp = bmp_load2byte(data + 28);
+ return 0;
+}
+
+void bmp_get_size(struct bmp_decdata *bmp, int *width, int *height)
+{
+ *width = bmp->width;
+ *height = bmp->height;
+}
+
+
+int bmp_show(struct bmp_decdata *bmp, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest)
+{
+ if (bmp->datap == pic)
+ return 0;
+ /* now only support 24bpp bmp file */
+ if ((depth == 24) && (bmp->bpp == 24)) {
+ raw_data_format_adjust_24bpp(bmp->datap, pic, width, height,
+ bytes_per_line_dest);
+ return 0;
+ }
+ return 1;
+}
diff --git a/src/bmp.h b/src/bmp.h
new file mode 100644
index 0000000..7ae8e87
--- /dev/null
+++ b/src/bmp.h
@@ -0,0 +1,25 @@
+#ifndef BMP_H
+#define BMP_H
+#include "types.h"
+
+struct bmp_decdata {
+ struct tagRGBQUAD *quadp;
+ unsigned char *datap;
+ int width;
+ int height;
+ int bpp;
+};
+
+/* allocate decdata struct */
+struct bmp_decdata *bmp_alloc(void);
+
+/* extract information from bmp file data */
+int bmp_decode(struct bmp_decdata *bmp, unsigned char *data, int data_size);
+
+/* get bmp properties */
+void bmp_get_size(struct bmp_decdata *bmp, int *width, int *height);
+
+/* flush flat picture data to *pc */
+int bmp_show(struct bmp_decdata *bmp, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest);
+#endif
diff --git a/src/bootsplash.c b/src/bootsplash.c
index cf1a603..6ddfae8 100644
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -12,7 +12,7 @@
#include "jpeg.h" // splash
#include "biosvar.h" // SET_EBDA
#include "paravirt.h" // romfile_find
-
+#include "bmp.h"
/****************************************************************
* VESA structures
@@ -109,7 +109,7 @@ enable_vga_console(void)
static int
find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info
- , int width, int height)
+ , int width, int height, int bpp_req)
{
dprintf(3, "Finding vesa mode with dimensions %d/%d\n", width, height);
u16 *videomodes = SEGOFF_TO_FLATPTR(vesa_info->video_mode_ptr);
@@ -135,8 +135,13 @@ find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info
|| mode_info->y_resolution != height)
continue;
u8 depth = mode_info->bits_per_pixel;
- if (depth != 16 && depth != 24 && depth != 32)
- continue;
+ if (bpp_req == 0) {
+ if (depth != 16 && depth != 24 && depth != 32)
+ continue;
+ } else {
+ if (depth != bpp_req)
+ continue;
+ }
return videomode;
}
}
@@ -148,17 +153,25 @@ enable_bootsplash(void)
{
if (!CONFIG_BOOTSPLASH)
return;
+ /* splash picture can be bmp or jpeg file */
dprintf(3, "Checking for bootsplash\n");
+ u8 type = 0; /* 0 means jpg, 1 means bmp, default is 0=jpg */
int filesize;
u8 *filedata = romfile_loadfile("bootsplash.jpg", &filesize);
- if (!filedata)
- return;
+ if (!filedata) {
+ filedata = romfile_loadfile("bootsplash.bmp", &filesize);
+ if (!filedata)
+ return;
+ type = 1;
+ }
+ dprintf(3, "start showing bootsplash\n");
- u8 *picture = NULL;
+ u8 *picture = NULL; /* data buff used to be flushed to the video buf */
+ struct jpeg_decdata *jpeg = NULL;
+ struct bmp_decdata *bmp = NULL;
struct vesa_info *vesa_info = malloc_tmplow(sizeof(*vesa_info));
struct vesa_mode_info *mode_info = malloc_tmplow(sizeof(*mode_info));
- struct jpeg_decdata *jpeg = jpeg_alloc();
- if (!jpeg || !vesa_info || !mode_info) {
+ if (!vesa_info || !mode_info) {
warn_noalloc();
goto done;
}
@@ -184,20 +197,48 @@ enable_bootsplash(void)
vesa_info->vesa_version>>8, vesa_info->vesa_version&0xff,
vendor, product);
- // Parse jpeg and get image size.
- dprintf(5, "Decoding bootsplash.jpg\n");
- int ret = jpeg_decode(jpeg, filedata);
- if (ret) {
- dprintf(1, "jpeg_decode failed with return code %d...\n", ret);
- goto done;
+ int ret, width, height;
+ int bpp_require = 0;
+ if (type == 0) {
+ jpeg = jpeg_alloc();
+ if (!jpeg) {
+ warn_noalloc();
+ goto done;
+ }
+ /* Parse jpeg and get image size. */
+ dprintf(5, "Decoding bootsplash.jpg\n");
+ ret = jpeg_decode(jpeg, filedata);
+ if (ret) {
+ dprintf(1, "jpeg_decode failed with return code %d...\n", ret);
+ goto done;
+ }
+ jpeg_get_size(jpeg, &width, &height);
+ } else {
+ bmp = bmp_alloc();
+ if (!bmp) {
+ warn_noalloc();
+ goto done;
+ }
+ /* Parse bmp and get image size. */
+ dprintf(5, "Decoding bootsplash.bmp\n");
+ ret = bmp_decode(bmp, filedata, filesize);
+ if (ret) {
+ dprintf(1, "bmp_decode failed with return code %d...\n", ret);
+ goto done;
+ }
+ bmp_get_size(bmp, &width, &height);
+ bpp_require = 24;
}
- int width, height;
- jpeg_get_size(jpeg, &width, &height);
+ /* jpeg would use 16 or 24 bpp video mode, BMP use 24bpp mode only */
// Try to find a graphics mode with the corresponding dimensions.
- int videomode = find_videomode(vesa_info, mode_info, width, height);
- if (videomode < 0)
+ int videomode = find_videomode(vesa_info, mode_info, width, height,
+ bpp_require);
+ if (videomode < 0) {
+ dprintf(1, "failed to find a videomode with %dx%d %dbpp (0=any).\n",
+ width, height, bpp_require);
goto done;
+ }
void *framebuffer = mode_info->phys_base_ptr;
int depth = mode_info->bits_per_pixel;
dprintf(3, "mode: %04x\n", videomode);
@@ -206,17 +247,28 @@ enable_bootsplash(void)
dprintf(3, "bits per pixel: %d\n", depth);
// Allocate space for image and decompress it.
- int imagesize = width * height * (depth / 8);
+ int imagesize = height * mode_info->bytes_per_scanline;
picture = malloc_tmphigh(imagesize);
if (!picture) {
warn_noalloc();
goto done;
}
- dprintf(5, "Decompressing bootsplash.jpg\n");
- ret = jpeg_show(jpeg, picture, width, height, depth);
- if (ret) {
- dprintf(1, "jpeg_show failed with return code %d...\n", ret);
- goto done;
+
+ if (type == 0) {
+ dprintf(5, "Decompressing bootsplash.jpg\n");
+ ret = jpeg_show(jpeg, picture, width, height, depth);
+ if (ret) {
+ dprintf(1, "jpeg_show failed with return code %d...\n", ret);
+ goto done;
+ }
+ } else {
+ dprintf(5, "Decompressing bootsplash.bmp\n");
+ ret = bmp_show(bmp, picture, width, height, depth,
+ mode_info->bytes_per_scanline);
+ if (ret) {
+ dprintf(1, "bmp_show failed with return code %d...\n", ret);
+ goto done;
+ }
}
/* Switch to graphics mode */
@@ -231,7 +283,7 @@ enable_bootsplash(void)
}
/* Show the picture */
- dprintf(5, "Showing bootsplash.jpg\n");
+ dprintf(5, "Showing bootsplash picture\n");
iomemcpy(framebuffer, picture, imagesize);
dprintf(5, "Bootsplash copy complete\n");
BootsplashActive = 1;
@@ -241,7 +293,10 @@ done:
free(picture);
free(vesa_info);
free(mode_info);
- free(jpeg);
+ if (jpeg != NULL)
+ free(jpeg);
+ if (bmp != NULL)
+ free(bmp);
return;
}
--
1.7.6.rc1.1.g2c162b
by Michael S. Tsirkin
Add pci_find_capability to scan capability list.
Return 0 on error, capability offset if found.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
---
Not useful by itself, but should be handy if
we ever want to look at capabilities such as pci express.
diff --git a/src/pci.c b/src/pci.c
index 23a6878..324ac96 100644
--- a/src/pci.c
+++ b/src/pci.c
@@ -57,6 +57,30 @@ pci_config_maskw(u16 bdf, u32 addr, u16 off, u16 on)
pci_config_writew(bdf, addr, val);
}
+unsigned char pci_find_capability(u16 bdf, unsigned char cap_id)
+{
+ unsigned char next, prev;
+ int loop = 0;
+
+ if (!(pci_config_readb(bdf, PCI_STATUS) & PCI_STATUS_CAP_LIST))
+ return 0;
+
+ for (prev = PCI_CAPABILITY_LIST; (next = pci_config_readb(bdf, prev));
+ prev = next + PCI_CAP_LIST_NEXT) {
+ if (pci_config_readb(bdf, next + PCI_CAP_LIST_ID) == cap_id)
+ break;
+ if (loop++ > 0x100) {
+ dprintf(1, "ERROR: capability loop detected. "
+ "PCI device %02x:%02x.%x\n"
+ , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf)
+ , pci_bdf_to_fn(bdf));
+ return 0;
+ }
+ }
+
+ return next;
+}
+
// Helper function for foreachbdf() macro - return next device
int
pci_next(int bdf, int bus)
diff --git a/src/pci.h b/src/pci.h
index c34e348..160cfc1 100644
--- a/src/pci.h
+++ b/src/pci.h
@@ -110,6 +110,8 @@ void pci_reboot(void);
u32 pci_readl(u32 addr);
void pci_writel(u32 addr, u32 val);
+unsigned char pci_find_capability(u16 bdf, unsigned char cap_id);
+
// pirtable.c
void create_pirtable(void);
--
MST
by Wayne Xia
Patch 1 and 2 remains the same with V5, only patch 3 is new, it need
the patch
"Add "romfile" code to assist with extract integer config settings."
applied.
sorry for that previous patches got a bit mess about the versions,
please have a look about this one.
short description about patch 3:
when it boot up, try discover the qemu' configuration about whether
to show a brand picture, with out a menu followed.
--
Best Regards
Wayne Xia
mail:xiawenc@linux.vnet.ibm.com
tel:86-010-82450803
by Wayne Xia
try show the splash picture without menu=on, if user want to show it as a brand
Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com>
---
src/boot.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index fcc95ab..d27d44e 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -383,17 +383,26 @@ boot_add_cbfs(void *data, const char *desc, int prio)
static void
interactive_bootmenu(void)
{
- if (! CONFIG_BOOTMENU || ! qemu_cfg_show_boot_menu())
- return;
-
+ int scan_code;
while (get_keystroke(0) >= 0)
;
+ u32 menutime = romfile_loadint("etc/boot-menu-wait", 0);
+ if (!CONFIG_BOOTMENU || !qemu_cfg_show_boot_menu()) {
+ if (menutime > 0) {
+ enable_bootsplash();
+ scan_code = get_keystroke(menutime);
+ disable_bootsplash();
+ }
+ return;
+ }
+
printf("Press F12 for boot menu.\n\n");
- u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT);
+ if (menutime == 0)
+ menutime = DEFAULT_BOOTMENU_WAIT;
enable_bootsplash();
- int scan_code = get_keystroke(menutime);
+ scan_code = get_keystroke(menutime);
disable_bootsplash();
if (scan_code != 0x86)
/* not F12 */
--
1.7.6.rc1.1.g2c162b
by Wayne Xia
fix the jpeg decoder problem emerged when it was used in 24 BPP mode.
Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com>
---
src/bootsplash.c | 3 ++-
src/jpeg.c | 31 ++++++++++++++++++++++---------
src/jpeg.h | 4 ++--
3 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/bootsplash.c b/src/bootsplash.c
index 6ddfae8..265f3f8 100644
--- a/src/bootsplash.c
+++ b/src/bootsplash.c
@@ -256,7 +256,8 @@ enable_bootsplash(void)
if (type == 0) {
dprintf(5, "Decompressing bootsplash.jpg\n");
- ret = jpeg_show(jpeg, picture, width, height, depth);
+ ret = jpeg_show(jpeg, picture, width, height, depth,
+ mode_info->bytes_per_scanline);
if (ret) {
dprintf(1, "jpeg_show failed with return code %d...\n", ret);
goto done;
diff --git a/src/jpeg.c b/src/jpeg.c
index 1068291..a96a9d7 100644
--- a/src/jpeg.c
+++ b/src/jpeg.c
@@ -394,10 +394,10 @@ void jpeg_get_size(struct jpeg_decdata *jpeg, int *width, int *height)
*height = jpeg->height;
}
-int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
- , int width, int height, int depth)
+int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest)
{
- int m, mcusx, mcusy, mx, my;
+ int m, mcusx, mcusy, mx, my, mloffset, jpgbpl;
int max[6];
if (jpeg->height != height)
@@ -405,6 +405,9 @@ int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
if (jpeg->width != width)
return ERR_WIDTH_MISMATCH;
+ jpgbpl = width * depth / 8;
+ mloffset = bytes_per_line_dest > jpgbpl ? bytes_per_line_dest : jpgbpl;
+
mcusx = jpeg->width >> 4;
mcusy = jpeg->height >> 4;
@@ -434,18 +437,18 @@ int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
switch (depth) {
case 32:
col221111_32(jpeg->out,
- pic + (my * 16 * mcusx + mx) * 16 * 4,
- mcusx * 16 * 4);
+ pic + (my * 16 * mloffset + mx * 16 * 4),
+ mloffset);
break;
case 24:
col221111(jpeg->out,
- pic + (my * 16 * mcusx + mx) * 16 * 3,
- mcusx * 16 * 3);
+ pic + (my * 16 * mloffset + mx * 16 * 3),
+ mloffset);
break;
case 16:
col221111_16(jpeg->out,
- pic + (my * 16 * mcusx + mx) * (16 * 2),
- mcusx * (16 * 2));
+ pic + (my * 16 * mloffset + mx * 16 * 2),
+ mloffset);
break;
default:
return ERR_DEPTH_MISMATCH;
@@ -887,6 +890,15 @@ static void initcol(PREC q[][64])
#endif
+#ifdef __LITTLE_ENDIAN
+#define PIC(yin, xin, p, xout) \
+( \
+ y = outy[(yin) * 8 + xin], \
+ STORECLAMP(p[(xout) * 3 + 2], y + cr), \
+ STORECLAMP(p[(xout) * 3 + 1], y - cg), \
+ STORECLAMP(p[(xout) * 3 + 0], y + cb) \
+)
+#else
#define PIC(yin, xin, p, xout) \
( \
y = outy[(yin) * 8 + xin], \
@@ -894,6 +906,7 @@ static void initcol(PREC q[][64])
STORECLAMP(p[(xout) * 3 + 1], y - cg), \
STORECLAMP(p[(xout) * 3 + 2], y + cb) \
)
+#endif
#ifdef __LITTLE_ENDIAN
#define PIC_16(yin, xin, p, xout, add) \
diff --git a/src/jpeg.h b/src/jpeg.h
index a2ac501..2d08f45 100644
--- a/src/jpeg.h
+++ b/src/jpeg.h
@@ -5,7 +5,7 @@ struct jpeg_decdata;
struct jpeg_decdata *jpeg_alloc(void);
int jpeg_decode(struct jpeg_decdata *jpeg, unsigned char *buf);
void jpeg_get_size(struct jpeg_decdata *jpeg, int *width, int *height);
-int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic
- , int width, int height, int depth);
+int jpeg_show(struct jpeg_decdata *jpeg, unsigned char *pic, int width
+ , int height, int depth, int bytes_per_line_dest);
#endif
--
1.7.6.rc1.1.g2c162b
by Wayne Xia
Hi, I tried the patch 1 and 2, and tested it with qemu passing
data, it seems good. thanks.
于 2011-7-6 9:08, Kevin O'Connor 写道:
> Add romfile_loadint() function which can be used to extract a
> little-endian binary encoded integer from rom.
> ---
> src/paravirt.c | 19 +++++++++++++++++++
> src/paravirt.h | 1 +
> 2 files changed, 20 insertions(+), 0 deletions(-)
>
> diff --git a/src/paravirt.c b/src/paravirt.c
> index 09e3d23..9cf77de 100644
> --- a/src/paravirt.c
> +++ b/src/paravirt.c
> @@ -409,3 +409,22 @@ romfile_loadfile(const char *name, int *psize)
> data[filesize] = '\0';
> return data;
> }
> +
> +// Attempt to load an integer from the given file - return 'defval'
> +// if unsuccesful.
> +u64
> +romfile_loadint(const char *name, u64 defval)
> +{
> + u32 file = romfile_find(name);
> + if (!file)
> + return defval;
> +
> + int filesize = romfile_size(file);
> + if (!filesize || filesize> sizeof(u64) || (filesize& (filesize-1)))
> + // Doesn't look like a valid integer.
> + return defval;
> +
> + u64 val = 0;
> + romfile_copy(file,&val, sizeof(val));
> + return val;
> +}
> diff --git a/src/paravirt.h b/src/paravirt.h
> index 7bf34b1..83166f4 100644
> --- a/src/paravirt.h
> +++ b/src/paravirt.h
> @@ -101,6 +101,7 @@ static inline const char* romfile_name(u32 fileid) {
> return qemu_cfg_name_file(fileid);
> }
> void *romfile_loadfile(const char *name, int *psize);
> +u64 romfile_loadint(const char *name, u64 defval);
>
> u32 qemu_cfg_e820_entries(void);
> void* qemu_cfg_e820_load_next(void *addr);
--
Best Regards
Wayne Xia
mail:xiawenc@linux.vnet.ibm.com
tel:86-010-82450803
by Kevin O'Connor
This patch series enables SeaBIOS to pull common config settings from
CBFS (on coreboot) or fw_cfg (on QEmu). The series also converts
several compile-time settings to this new dynamic system.
I choose to place the file names in the "etc/" directory so that it is
clear they are configuration settings.
On coreboot, a user would do the following to enable a setting:
/path/to/seabios/tools/encodeint.py boot-menu-wait 5500
./build/cbfstool coreboot.rom add boot-menu-wait etc/boot-menu-wait raw
./build/cbfstool coreboot.rom print
See the patch descriptions below for the six compile-time settings
that are converted.
-Kevin
Kevin O'Connor (8):
Add "romfile" code to assist with extract integer config settings.
Replace CONFIG_BOOTMENU_WAIT with dynamic "etc/boot-menu-wait" file.
Replace CONFIG_EXTRA_PCI_ROOTS with dynamic "etc/extra-pci-roots"
file.
Replace CONFIG_PS2_KEYBOARD_SPINUP with "etc/ps2-keyboard-spinup"
file.
Replace "CONFIG_OPTIONROMS_CHECKSUM" with "etc/optionroms-checksum"
file.
Replace CONFIG_S3_RESUME_VGA_INIT with "etc/s3-resume-vga-init" file.
Replace CONFIG_SCREEN_AND_DEBUG with "etc/screen-and-debug" file.
Add utility "tools/encodeint.py" for CBFS config file creation.
src/Kconfig | 50 --------------------------------------------------
src/boot.c | 5 ++++-
src/optionroms.c | 14 ++++++++++++--
src/output.c | 4 ++--
src/paravirt.c | 19 +++++++++++++++++++
src/paravirt.h | 2 ++
src/pci.c | 8 ++++----
src/ps2port.c | 6 ++++--
src/util.h | 1 +
tools/encodeint.py | 21 +++++++++++++++++++++
10 files changed, 69 insertions(+), 61 deletions(-)
create mode 100755 tools/encodeint.py
--
1.7.4.4
