CVS commit: src/sys/dev/rasops

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Tue Apr 13 20:10:38 UTC 2010

Modified Files:
        src/sys/dev/rasops: rasops1.c

Log Message:
fix a bunch of typos, now 8 bit fonts work properly


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/rasops/rasops1.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/rasops/rasops1.c
diff -u src/sys/dev/rasops/rasops1.c:1.21 src/sys/dev/rasops/rasops1.c:1.22
--- src/sys/dev/rasops/rasops1.c:1.21	Thu Apr  8 16:45:53 2010
+++ src/sys/dev/rasops/rasops1.c	Tue Apr 13 20:10:38 2010
@@ -1,4 +1,4 @@
-/* 	$NetBSD: rasops1.c,v 1.21 2010/04/08 16:45:53 macallan Exp $	*/
+/* 	$NetBSD: rasops1.c,v 1.22 2010/04/13 20:10:38 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.21 2010/04/08 16:45:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.22 2010/04/13 20:10:38 macallan Exp $");
 
 #include "opt_rasops.h"
 
@@ -297,7 +297,7 @@
 
 	rp = ri->ri_bits + row * ri->ri_yscale + col * ri->ri_xscale;
 	if (ri->ri_hwbits)
-		hrp = ri->ri_bits + row * ri->ri_yscale + col * ri->ri_xscale;
+		hrp = ri->ri_hwbits + row * ri->ri_yscale + col * ri->ri_xscale;
 	height = ri->ri_font->fontheight;
 	rs = ri->ri_stride;
 
@@ -346,10 +346,12 @@
 	}
 
 	/* Do underline */
-	if ((attr & 1) != 0)
+	if ((attr & 1) != 0) {
 		rp[-(ri->ri_stride << 1)] = fg;
-		if (ri->ri_hwbits)
-			hrp[-(ri->ri_stride << 1)] = fg;		
+		if (ri->ri_hwbits) {
+			hrp[-(ri->ri_stride << 1)] = fg;
+		}
+	}
 }
 
 /*