aboutsummaryrefslogtreecommitdiffstats
path: root/com32/lib/sys/vesa/initvesa.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-09-14 14:43:44 -0700
committerH. Peter Anvin <hpa@zytor.com>2006-09-14 14:43:44 -0700
commitc282957e1ab8c23d881c93f54e478b051896c721 (patch)
tree453d31d41b0a4e273d44711a8412c7690ba99199 /com32/lib/sys/vesa/initvesa.c
parentf97a0cfda277f0651d7cc2d59733c81796b7cc89 (diff)
downloadsyslinux-c282957e1ab8c23d881c93f54e478b051896c721.tar.gz
syslinux-c282957e1ab8c23d881c93f54e478b051896c721.tar.xz
syslinux-c282957e1ab8c23d881c93f54e478b051896c721.zip
Default background; skip background if VESA is uninitializedsyslinux-3.30-pre7
Diffstat (limited to 'com32/lib/sys/vesa/initvesa.c')
-rw-r--r--com32/lib/sys/vesa/initvesa.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/com32/lib/sys/vesa/initvesa.c b/com32/lib/sys/vesa/initvesa.c
index 8acbe996..7394c9d1 100644
--- a/com32/lib/sys/vesa/initvesa.c
+++ b/com32/lib/sys/vesa/initvesa.c
@@ -47,7 +47,7 @@ struct vesa_info __vesa_info;
struct vesa_char *__vesacon_text_display;
int __vesacon_font_height, __vesacon_text_rows;
-enum vesa_pixel_format __vesacon_pixel_format;
+enum vesa_pixel_format __vesacon_pixel_format = PXF_NONE;
unsigned int __vesacon_bytes_per_pixel;
uint8_t __vesacon_graphics_font[FONT_MAX_CHARS][FONT_MAX_HEIGHT];
@@ -189,7 +189,6 @@ static int vesacon_set_mode(void)
mi = &__vesa_info.mi;
mode = bestmode;
- __vesacon_pixel_format = bestpxf;
__vesacon_bytes_per_pixel = mi->bpp >> 3;
/* Download the SYSLINUX- or BIOS-provided font */
@@ -230,6 +229,8 @@ static int vesacon_set_mode(void)
rm.edx.w[0] = VIDEO_Y_SIZE;
__intcall(0x22, &rm, NULL);
+ __vesacon_pixel_format = bestpxf;
+
return 0;
}