ia64/xen-unstable

changeset 13400:204c2724f800

[XEN] Default to 80x50 VGA text console.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Fri Jan 12 10:48:46 2007 +0000 (2007-01-12)
parents f328425d553e
children 9c6531217c7c
files xen/drivers/video/vga.c
line diff
     1.1 --- a/xen/drivers/video/vga.c	Fri Jan 12 10:31:16 2007 +0000
     1.2 +++ b/xen/drivers/video/vga.c	Fri Jan 12 10:48:46 2007 +0000
     1.3 @@ -557,7 +557,7 @@ static int vga_load_font(const struct fo
     1.4  
     1.5  static int vgacon_enabled = 0;
     1.6  static int vgacon_keep    = 0;
     1.7 -static int vgacon_lines   = 25;
     1.8 +static int vgacon_lines   = 50;
     1.9  static const struct font_desc *font;
    1.10  
    1.11  static int xpos, ypos;
    1.12 @@ -606,12 +606,9 @@ void vga_init(void)
    1.13      case 60:
    1.14          font = &font_vga_8x8;
    1.15          break;
    1.16 -    default:
    1.17 -        vgacon_lines = 25;
    1.18 -        break;
    1.19      }
    1.20  
    1.21 -    if ( (font != NULL) && (vga_load_font(font, vgacon_lines) < 0) )
    1.22 +    if ( (font == NULL) || (vga_load_font(font, vgacon_lines) < 0) )
    1.23      {
    1.24          vgacon_lines = 25;
    1.25          font = NULL;