| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: rasops.c,v 1.122 2019/08/10 01:24:17 rin Exp $ */ | | 1 | /* $NetBSD: rasops.c,v 1.123 2020/07/02 07:49:44 rin Exp $ */ |
| 2 | | | 2 | |
| 3 | /*- | | 3 | /*- |
| 4 | * Copyright (c) 1999 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 1999 The NetBSD Foundation, Inc. |
| 5 | * All rights reserved. | | 5 | * All rights reserved. |
| 6 | * | | 6 | * |
| 7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
| 8 | * by Andrew Doran. | | 8 | * by Andrew Doran. |
| 9 | * | | 9 | * |
| 10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
| 11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
| 12 | * are met: | | 12 | * are met: |
| 13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
| 14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -20,27 +20,27 @@ | | | @@ -20,27 +20,27 @@ |
| 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
| 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS |
| 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 29 | * POSSIBILITY OF SUCH DAMAGE. | | 29 | * POSSIBILITY OF SUCH DAMAGE. |
| 30 | */ | | 30 | */ |
| 31 | | | 31 | |
| 32 | #include <sys/cdefs.h> | | 32 | #include <sys/cdefs.h> |
| 33 | __KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.122 2019/08/10 01:24:17 rin Exp $"); | | 33 | __KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.123 2020/07/02 07:49:44 rin Exp $"); |
| 34 | | | 34 | |
| 35 | #ifdef _KERNEL_OPT | | 35 | #ifdef _KERNEL_OPT |
| 36 | #include "opt_rasops.h" | | 36 | #include "opt_rasops.h" |
| 37 | #include "opt_wsmsgattrs.h" | | 37 | #include "opt_wsmsgattrs.h" |
| 38 | #include "rasops_glue.h" | | 38 | #include "rasops_glue.h" |
| 39 | #endif | | 39 | #endif |
| 40 | | | 40 | |
| 41 | #include <sys/param.h> | | 41 | #include <sys/param.h> |
| 42 | #include <sys/bswap.h> | | 42 | #include <sys/bswap.h> |
| 43 | #include <sys/kmem.h> | | 43 | #include <sys/kmem.h> |
| 44 | | | 44 | |
| 45 | #include <machine/endian.h> | | 45 | #include <machine/endian.h> |
| 46 | | | 46 | |
| @@ -1109,27 +1109,27 @@ rasops_do_cursor(struct rasops_info *ri) | | | @@ -1109,27 +1109,27 @@ rasops_do_cursor(struct rasops_info *ri) |
| 1109 | | | 1109 | |
| 1110 | mask1 = rasops_lmask32[4 - slop1]; | | 1110 | mask1 = rasops_lmask32[4 - slop1]; |
| 1111 | mask2 = rasops_rmask32[slop2]; | | 1111 | mask2 = rasops_rmask32[slop2]; |
| 1112 | | | 1112 | |
| 1113 | while (height--) { | | 1113 | while (height--) { |
| 1114 | dp = (uint32_t *)rp; | | 1114 | dp = (uint32_t *)rp; |
| 1115 | | | 1115 | |
| 1116 | if (slop1) { | | 1116 | if (slop1) { |
| 1117 | *dp = *dp ^ mask1; | | 1117 | *dp = *dp ^ mask1; |
| 1118 | dp++; | | 1118 | dp++; |
| 1119 | } | | 1119 | } |
| 1120 | | | 1120 | |
| 1121 | for (cnt = full; cnt; cnt--) { | | 1121 | for (cnt = full; cnt; cnt--) { |
| 1122 | *dp = ~*(uint32_t *)dp; | | 1122 | *dp = ~*dp; |
| 1123 | dp++; | | 1123 | dp++; |
| 1124 | } | | 1124 | } |
| 1125 | | | 1125 | |
| 1126 | if (slop2) | | 1126 | if (slop2) |
| 1127 | *dp = *dp ^ mask2; | | 1127 | *dp = *dp ^ mask2; |
| 1128 | | | 1128 | |
| 1129 | if (ri->ri_hwbits) { | | 1129 | if (ri->ri_hwbits) { |
| 1130 | memcpy(hp, rp, ((slop1 != 0) + full + | | 1130 | memcpy(hp, rp, ((slop1 != 0) + full + |
| 1131 | (slop2 != 0)) << 2); | | 1131 | (slop2 != 0)) << 2); |
| 1132 | hp += ri->ri_stride; | | 1132 | hp += ri->ri_stride; |
| 1133 | } | | 1133 | } |
| 1134 | rp += ri->ri_stride; | | 1134 | rp += ri->ri_stride; |
| 1135 | } | | 1135 | } |