45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
Index: xen-3.0.4-testing/xen/drivers/video/vga.c
|
|
===================================================================
|
|
--- xen-3.0.4-testing.orig/xen/drivers/video/vga.c
|
|
+++ xen-3.0.4-testing/xen/drivers/video/vga.c
|
|
@@ -557,7 +557,7 @@ static int vga_load_font(const struct fo
|
|
|
|
static int vgacon_enabled = 0;
|
|
static int vgacon_keep = 0;
|
|
-static int vgacon_lines = 25;
|
|
+static int vgacon_lines = 50;
|
|
static const struct font_desc *font;
|
|
|
|
static int xpos, ypos;
|
|
@@ -609,6 +609,8 @@ void vga_init(void)
|
|
vgacon_keep = 1;
|
|
else if ( strncmp(p, "text-80x", 8) == 0 )
|
|
vgacon_lines = simple_strtoul(p + 8, NULL, 10);
|
|
+ else if ( strncmp(p, "text", 4) == 0 && p[4] != '-' )
|
|
+ vgacon_lines = 0;
|
|
}
|
|
|
|
video = setup_vga();
|
|
@@ -625,17 +627,18 @@ void vga_init(void)
|
|
case 34:
|
|
font = &font_vga_8x14;
|
|
break;
|
|
+ default:
|
|
+ vgacon_lines = 50;
|
|
case 43:
|
|
case 50:
|
|
case 60:
|
|
font = &font_vga_8x8;
|
|
break;
|
|
- default:
|
|
- vgacon_lines = 25;
|
|
+ case 0:
|
|
break;
|
|
}
|
|
|
|
- if ( (font != NULL) && (vga_load_font(font, vgacon_lines) < 0) )
|
|
+ if ( (font == NULL) || (vga_load_font(font, vgacon_lines) < 0) )
|
|
{
|
|
vgacon_lines = 25;
|
|
font = NULL;
|