Author: hbelusca Date: Fri Aug 9 14:01:43 2013 New Revision: 59681
URL: http://svn.reactos.org/svn/reactos?rev=59681&view=rev Log: [NTVDM] Simplify code.
Modified: branches/ntvdm/subsystems/ntvdm/vga.c
Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?rev... ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Aug 9 14:01:43 2013 @@ -569,7 +569,7 @@ COORD VgaGetDisplayResolution(VOID) { COORD Resolution; - BYTE TextSize = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F);
/* The low 8 bits are in the display registers */ Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; @@ -597,15 +597,10 @@
/* The horizontal resolution is halved in 8-bit mode */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) Resolution.X /= 2; - - /* Divide the vertical resolution by the maximum scan line */ - Resolution.Y /= ((DWORD)VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F) + 1; - } - else - { - /* Divide the number of scanlines by the font size */ - Resolution.Y /= TextSize; - } + } + + /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ + Resolution.Y /= MaximumScanLine;
/* Return the resolution */ return Resolution;