Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/rasops Misc cleen up:



details:   https://anonhg.NetBSD.org/src/rev/148fbe6a0316
branches:  trunk
changeset: 1000444:148fbe6a0316
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Jul 25 02:26:32 2019 +0000

description:
Misc cleen up:
- Make 32bit mask unsigned
- DPRINTF --> __nothing ifndef DEBUG_RASOPS
- "#ifdef DIAGNOSTIC if (x) panic(); #endif" --> KASSERT(!x);
- KNF

No functional changes intended.

diffstat:

 sys/dev/rasops/rasops.c        |  83 +++++++++++++++++++++--------------------
 sys/dev/rasops/rasops1.c       |  20 +++++-----
 sys/dev/rasops/rasops15.c      |  23 +++++------
 sys/dev/rasops/rasops2.c       |  13 ++----
 sys/dev/rasops/rasops24.c      |  26 ++++--------
 sys/dev/rasops/rasops4.c       |  40 +++++++-------------
 sys/dev/rasops/rasops8.c       |  25 ++++++++----
 sys/dev/rasops/rasops_bitops.h |   5 +-
 8 files changed, 111 insertions(+), 124 deletions(-)

diffs (truncated from 736 to 300 lines):

diff -r 876691726264 -r 148fbe6a0316 sys/dev/rasops/rasops.c
--- a/sys/dev/rasops/rasops.c   Thu Jul 25 02:00:40 2019 +0000
+++ b/sys/dev/rasops/rasops.c   Thu Jul 25 02:26:32 2019 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rasops.c,v 1.87 2019/07/25 00:55:13 rin Exp $ */
+/*      $NetBSD: rasops.c,v 1.88 2019/07/25 02:26:32 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.87 2019/07/25 00:55:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.88 2019/07/25 02:26:32 rin Exp $");
 
 #include "opt_rasops.h"
 #include "rasops_glue.h"
@@ -54,9 +54,9 @@
 #endif
 
 #ifdef RASOPS_DEBUG
-#define DPRINTF aprint_error
+#define DPRINTF(...) aprint_error(...)
 #else
-#define DPRINTF while (0) printf
+#define DPRINTF(...) __nothing
 #endif
 
 struct rasops_matchdata {
@@ -223,7 +223,7 @@
                 */
                if (cookie <= 0) {
                        aprint_error("rasops_init: font table is empty\n");
-                       return (-1);
+                       return -1;
                }
 
 #if NRASOPS_ROTATION > 0
@@ -241,7 +241,7 @@
 
                if (wsfont_lock(cookie, &ri->ri_font)) {
                        aprint_error("rasops_init: couldn't lock font\n");
-                       return (-1);
+                       return -1;
                }
 
                ri->ri_wsfcookie = cookie;
@@ -251,21 +251,23 @@
        /* This should never happen in reality... */
 #ifdef DEBUG
        if ((long)ri->ri_bits & 3) {
-               aprint_error("rasops_init: bits not aligned on 32-bit boundary\n");
-               return (-1);
+               aprint_error(
+                   "rasops_init: bits not aligned on 32-bit boundary\n");
+               return -1;
        }
 
        if ((int)ri->ri_stride & 3) {
-               aprint_error("rasops_init: stride not aligned on 32-bit boundary\n");
-               return (-1);
+               aprint_error(
+                   "rasops_init: stride not aligned on 32-bit boundary\n");
+               return -1;
        }
 #endif
 
        if (rasops_reconfig(ri, wantrows, wantcols))
-               return (-1);
+               return -1;
 
        rasops_init_devcmap(ri);
-       return (0);
+       return 0;
 }
 
 /*
@@ -392,7 +394,8 @@
                if (ri->ri_hwbits != NULL) {
                        ri->ri_hwbits += (((ri->ri_width * bpp >> 3) -
                            ri->ri_emustride) >> 1) & ~3;
-                       ri->ri_hwbits += ((ri->ri_height - ri->ri_emuheight) >> 1) *
+                       ri->ri_hwbits +=
+                           ((ri->ri_height - ri->ri_emuheight) >> 1) *
                            ri->ri_stride;
                }
                ri->ri_yorigin = (int)(ri->ri_bits - ri->ri_origbits)
@@ -465,7 +468,7 @@
        default:
                ri->ri_flg &= ~RI_CFGDONE;
                splx(s);
-               return (-1);
+               return -1;
        }
 
 #if NRASOPS_ROTATION > 0
@@ -490,7 +493,7 @@
 
        ri->ri_flg |= RI_CFGDONE;
        splx(s);
-       return (0);
+       return 0;
 }
 
 /*
@@ -503,29 +506,26 @@
 
        ri = (struct rasops_info *)cookie;
 
-#ifdef DIAGNOSTIC
-       if (ri->ri_font == NULL)
-               panic("rasops_mapchar: no font selected");
-#endif
+       KASSERT(ri->ri_font != NULL);
 
        if ( (c = wsfont_map_unichar(ri->ri_font, c)) < 0) {
                *cp = ' ';
-               return (0);
+               return 0;
        }
 
        if (c < ri->ri_font->firstchar) {
                *cp = ' ';
-               return (0);
+               return 0;
        }
 
 #if 0
        if (c - ri->ri_font->firstchar >= ri->ri_font->numchars) {
                *cp = ' ';
-               return (0);
+               return 0;
        }
 #endif
        *cp = c;
-       return (5);
+       return 5;
 }
 
 /*
@@ -539,14 +539,14 @@
 
        if (__predict_false((unsigned int)fg >= sizeof(rasops_isgray) ||
            (unsigned int)bg >= sizeof(rasops_isgray)))
-               return (EINVAL);
+               return EINVAL;
 
 #ifdef RASOPS_CLIPPING
        fg &= 7;
        bg &= 7;
 #endif
        if ((flg & WSATTR_BLINK) != 0)
-               return (EINVAL);
+               return EINVAL;
 
        if ((flg & WSATTR_WSCOLORS) == 0) {
 #ifdef WS_DEFAULT_FG
@@ -579,7 +579,7 @@
                flg |= WSATTR_PRIVATE2;
 
        *attr = (bg << 16) | (fg << 24) | flg;
-       return (0);
+       return 0;
 }
 
 /*
@@ -592,7 +592,7 @@
        int swap;
 
        if ((flg & (WSATTR_BLINK | WSATTR_HILIT | WSATTR_WSCOLORS)) != 0)
-               return (EINVAL);
+               return EINVAL;
 
        fg = 1;
        bg = 0;
@@ -604,7 +604,7 @@
        }
 
        *attr = (bg << 16) | (fg << 24) | ((flg & WSATTR_UNDERLINE) ? 7 : 6);
-       return (0);
+       return 0;
 }
 
 /*
@@ -835,10 +835,10 @@
 
        case 2:
                for (i = 1; i < 15; i++)
-                       ri->ri_devcmap[i] = 0xaaaaaaaa;
+                       ri->ri_devcmap[i] = 0xaaaaaaaaU;
 
                ri->ri_devcmap[0] = 0;
-               ri->ri_devcmap[8] = 0x55555555;
+               ri->ri_devcmap[8] = 0x55555555U;
                ri->ri_devcmap[15] = -1;
                return;
 
@@ -1427,10 +1427,12 @@
 
        if (src > dst)
                for (coff = 0; coff < num; coff++)
-                       rasops_copychar(cookie, row, row, src + coff, dst + coff);
+                       rasops_copychar(cookie, row, row, src + coff,
+                           dst + coff);
        else
                for (coff = num - 1; coff >= 0; coff--)
-                       rasops_copychar(cookie, row, row, src + coff, dst + coff);
+                       rasops_copychar(cookie, row, row, src + coff,
+                           dst + coff);
 }
 
 static void
@@ -1451,7 +1453,8 @@
  * built-in Sharp W-ZERO3 display in 16bpp).
  */
 static void
-rasops_copychar_ccw(void *cookie, int srcrow, int dstrow, int srccol, int dstcol)
+rasops_copychar_ccw(void *cookie, int srcrow, int dstrow, int srccol,
+    int dstcol)
 {
        struct rasops_info *ri;
        uint8_t *sp, *dp;
@@ -1562,7 +1565,7 @@
 
        vert_mask = 0xc000 >> ((ri->ri_font->fontwidth >> 1) - 1);
        hmask_left = 0xff00 << (8 - (ri->ri_font->fontwidth >> 1));
-       hmask_right = hmask_left >> ((ri->ri_font->fontwidth + 1)>> 1);
+       hmask_right = hmask_left >> ((ri->ri_font->fontwidth + 1) >> 1);
        mid = (ri->ri_font->fontheight + 1) >> 1;
 
        /* 0x00 would be empty anyway so don't bother */
@@ -1601,7 +1604,7 @@
 
        vert_mask = 0xc0 >> ((ri->ri_font->fontwidth >> 1) - 1);
        hmask_left = 0xf0 << (4 - (ri->ri_font->fontwidth >> 1));
-       hmask_right = hmask_left >> ((ri->ri_font->fontwidth + 1)>> 1);
+       hmask_right = hmask_left >> ((ri->ri_font->fontwidth + 1) >> 1);
        mid = (ri->ri_font->fontheight + 1) >> 1;
 
        /* 0x00 would be empty anyway so don't bother */
@@ -1638,9 +1641,9 @@
        uint32_t *data = (uint32_t *)ri->ri_optfont.data;
        int c, i, mid;
 
-       vert_mask = 0xc0000000 >> ((ri->ri_font->fontwidth >> 1) - 1);
-       hmask_left = 0xffff0000 << (16 - (ri->ri_font->fontwidth >> 1));
-       hmask_right = hmask_left >> ((ri->ri_font->fontwidth + 1)>> 1);
+       vert_mask = 0xc0000000U >> ((ri->ri_font->fontwidth >> 1) - 1);
+       hmask_left = 0xffff0000U << (16 - (ri->ri_font->fontwidth >> 1));
+       hmask_right = hmask_left >> ((ri->ri_font->fontwidth + 1) >> 1);
        mid = (ri->ri_font->fontheight + 1) >> 1;
 
        /* 0x00 would be empty anyway so don't bother */
@@ -1731,6 +1734,7 @@
 int
 rasops_get_cmap(struct rasops_info *ri, uint8_t *palette, size_t bytes)
 {
+
        if ((ri->ri_depth == 8 ) && ((ri->ri_flg & RI_8BIT_IS_RGB) > 0)) {
                /* generate an R3G3B2 palette */
                int i, idx = 0;
@@ -1759,8 +1763,7 @@
                        palette[idx] = tmp;
                        idx++;
                }
-       } else {
+       } else
                memcpy(palette, rasops_cmap, MIN(bytes, sizeof(rasops_cmap)));
-       }
        return 0;
 }
diff -r 876691726264 -r 148fbe6a0316 sys/dev/rasops/rasops1.c
--- a/sys/dev/rasops/rasops1.c  Thu Jul 25 02:00:40 2019 +0000
+++ b/sys/dev/rasops/rasops1.c  Thu Jul 25 02:26:32 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rasops1.c,v 1.26 2019/07/24 18:33:49 rin Exp $ */
+/*     $NetBSD: rasops1.c,v 1.27 2019/07/25 02:26:32 rin Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.26 2019/07/24 18:33:49 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.27 2019/07/25 02:26:32 rin Exp $");
 
 #include "opt_rasops.h"
 
@@ -219,11 +219,11 @@
                                        fb = ~(fr[3] | (fr[2] << 8) |
                                            (fr[1] << 16) | (fr[0] << 24));
 
-                                       tmp = (rp[0] & lmask)
-                                           | MBE((u_int)fb >> col);
+                                       tmp = (rp[0] & lmask) |
+                                           MBE((u_int)fb >> col);
 
-                                       tmp2 = (rp[1] & rmask)



Home | Main Index | Thread Index | Old Index