svn commit: r210248 - head/sys/dev/syscons

[Jung-uk Kim]

Author: jkim
Date: Mon Jul 19 18:56:18 2010
New Revision: 210248
URL: http://svn.freebsd.org/changeset/base/210248

Log:
  Fix two long-standing line wrapping bugs in VGA renderer for pixel mode.
  Font size may be smaller than 16 and logical scan line may be larger than
  the displayed scan line.
  
  MFC after:	3 days

Modified:
  head/sys/dev/syscons/scvgarndr.c

Modified: head/sys/dev/syscons/scvgarndr.c
==============================================================================
--- head/sys/dev/syscons/scvgarndr.c	Mon Jul 19 18:47:18 2010	(r210247)
+++ head/sys/dev/syscons/scvgarndr.c	Mon Jul 19 18:56:18 2010	(r210248)
@@ -766,8 +766,9 @@ vga_vgadraw_direct(scr_stat *scp, int fr
 		d += 8 * pixel_size;
 
 		if ((i % scp->xsize) == scp->xsize - 1)
-			d += scp->xoff * 16 * pixel_size +
-			     (scp->font_size - 1) * line_width;
+			d += scp->xoff * scp->font_size * pixel_size +
+			    scp->font_size * line_width -
+			    scp->xpixel * pixel_size;
 	}
 }