CVS commit: src/sys/dev/rasops

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Wed Dec  5 05:52:23 UTC 2018

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

Log Message:
It's WSATTR_UNDERLINE, not WS_UNDERLINE.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/rasops/rasops4.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/rasops4.c
diff -u src/sys/dev/rasops/rasops4.c:1.12 src/sys/dev/rasops/rasops4.c:1.13
--- src/sys/dev/rasops/rasops4.c:1.12	Tue Dec  4 09:27:59 2018
+++ src/sys/dev/rasops/rasops4.c	Wed Dec  5 05:52:23 2018
@@ -1,4 +1,4 @@
-/* 	$NetBSD: rasops4.c,v 1.12 2018/12/04 09:27:59 mlelstv Exp $	*/
+/* 	$NetBSD: rasops4.c,v 1.13 2018/12/05 05:52:23 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.12 2018/12/04 09:27:59 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.13 2018/12/05 05:52:23 mlelstv Exp $");
 
 #include "opt_rasops.h"
 
@@ -159,7 +159,7 @@ rasops4_putchar(void *cookie, int row, i
 		}
 
 		/* Do underline */
-		if (attr & WS_UNDERLINE) {
+		if (attr & WSATTR_UNDERLINE) {
 			DELTA(rp, -(ri->ri_stride << 1), int32_t *);
 			*rp = (*rp & lmask) | (fg & rmask);
 		}
@@ -196,7 +196,7 @@ rasops4_putchar(void *cookie, int row, i
 		}
 
 		/* Do underline */
-		if (attr & WS_UNDERLINE) {
+		if (attr & WSATTR_UNDERLINE) {
 			DELTA(rp, -(ri->ri_stride << 1), int32_t *);
 			rp[0] = (rp[0] & lmask) | (fg & ~lmask);
 			rp[1] = (rp[1] & rmask) | (fg & ~rmask);
@@ -311,7 +311,7 @@ rasops4_putchar8(void *cookie, int row, 
 	}
 
 	/* Do underline */
-	if ((attr & WS_UNDERLINE) != 0) {
+	if ((attr & WSATTR_UNDERLINE) != 0) {
 		rp -= (rs << 1);
 		rp[0] = stamp[15];
 		rp[1] = stamp[15];
@@ -383,7 +383,7 @@ rasops4_putchar12(void *cookie, int row,
 	}
 
 	/* Do underline */
-	if ((attr & WS_UNDERLINE) != 0) {
+	if ((attr & WSATTR_UNDERLINE) != 0) {
 		rp -= (rs << 1);
 		rp[0] = stamp[15];
 		rp[1] = stamp[15];
@@ -458,7 +458,7 @@ rasops4_putchar16(void *cookie, int row,
 	}
 
 	/* Do underline */
-	if ((attr & WS_UNDERLINE) != 0) {
+	if ((attr & WSATTR_UNDERLINE) != 0) {
 		rp -= (rs << 1);
 		rp[0] = stamp[15];
 		rp[1] = stamp[15];