Module Name: src
Committed By: rin
Date: Fri Aug 2 04:26:44 UTC 2019
Modified Files:
src/sys/dev/rasops: rasops_bitops.h
Log Message:
Remove duplicate substitution. Style. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/rasops/rasops_bitops.h
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_bitops.h
diff -u src/sys/dev/rasops/rasops_bitops.h:1.19 src/sys/dev/rasops/rasops_bitops.h:1.20
--- src/sys/dev/rasops/rasops_bitops.h:1.19 Thu Aug 1 03:43:54 2019
+++ src/sys/dev/rasops/rasops_bitops.h Fri Aug 2 04:26:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops_bitops.h,v 1.19 2019/08/01 03:43:54 rin Exp $ */
+/* $NetBSD: rasops_bitops.h,v 1.20 2019/08/02 04:26:44 rin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,7 +45,6 @@ NAME(erasecols)(void *cookie, int row, i
hp = NULL; /* XXX GCC */
-
#ifdef RASOPS_CLIPPING
if ((unsigned)row >= (unsigned)ri->ri_rows)
return;
@@ -61,6 +60,7 @@ NAME(erasecols)(void *cookie, int row, i
if (num <= 0)
return;
#endif
+
col *= ri->ri_font->fontwidth << PIXEL_SHIFT;
num *= ri->ri_font->fontwidth << PIXEL_SHIFT;
height = ri->ri_font->fontheight;
@@ -186,6 +186,7 @@ NAME(do_cursor)(struct rasops_info *ri)
(rmask != -1)) << 2);
DELTA(hp, ri->ri_stride, uint32_t *);
}
+
DELTA(rp, ri->ri_stride, uint32_t *);
}
}
@@ -336,7 +337,6 @@ NAME(copycols)(void *cookie, int row, in
if (ri->ri_hwbits)
dhp = (uint32_t *)(ri->ri_hwbits + row +
((dst >> 3) & ~3));
- db = dst & 31;
while (height--) {
sb = src & 31;
@@ -348,7 +348,8 @@ NAME(copycols)(void *cookie, int row, in
PUTBITS(tmp, db, lnum, dp);
dp++;
- if (sb += lnum > 31) {
+ sb += lnum;
+ if (sb > 31) {
sp++;
sb -= 32;
}
