Module Name: src Committed By: rin Date: Mon Jul 29 01:04:20 UTC 2019
Modified Files: src/sys/dev/rasops: rasops.c Log Message: Fix missing underlines on mono screen. Style. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/dev/rasops/rasops.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/rasops.c diff -u src/sys/dev/rasops/rasops.c:1.94 src/sys/dev/rasops/rasops.c:1.95 --- src/sys/dev/rasops/rasops.c:1.94 Sun Jul 28 12:06:10 2019 +++ src/sys/dev/rasops/rasops.c Mon Jul 29 01:04:20 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rasops.c,v 1.94 2019/07/28 12:06:10 rin Exp $ */ +/* $NetBSD: rasops.c,v 1.95 2019/07/29 01:04:20 rin Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.94 2019/07/28 12:06:10 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.95 2019/07/29 01:04:20 rin Exp $"); #include "opt_rasops.h" #include "rasops_glue.h" @@ -511,7 +511,7 @@ rasops_reconfig(struct rasops_info *ri, rasops8_init(ri); break; #endif -#if NRASOPS15 > 0 || NRASOPS16 > 0 +#if (NRASOPS15 + NRASOPS16) > 0 case 15: case 16: rasops15_init(ri); @@ -659,7 +659,7 @@ rasops_allocattr_mono(void *cookie, int bg = swap; } - *attr = (bg << 16) | (fg << 24) | ((flg & WSATTR_UNDERLINE) ? 7 : 6); + *attr = (bg << 16) | (fg << 24) | flg; return 0; }