 @@ -1,14 +1,14 @@
-/*	$NetBSD: cgfourteen.c,v 1.91 2021/12/17 18:51:02 macallan Exp $ */
+/*	$NetBSD: cgfourteen.c,v 1.92 2021/12/17 19:27:57 macallan Exp $ */
 /*
  * Copyright (c) 1996
  *	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -1032,26 +1032,32 @@ cg14_init_screen(void *cookie, struct vc
 		if (FONT_IS_ALPHA(ri->ri_font)) {
 			ri->ri_ops.putchar = cg14_putchar_aa;
 		} else
 			ri->ri_ops.putchar = cg14_putchar;
+	}
 #endif /* NSX > 0 */
+}
 static void
 cg14_set_depth(struct cgfourteen_softc *sc, int depth)
+{
 	int i;
 	/* init mask */
 	if (sc->sc_sx != NULL) {
 		sc->sc_mask = 0xffffffff;
 		sx_write(sc->sc_sx, SX_QUEUED(R_MASK), sc->sc_mask);
+	}
 	if (sc->sc_depth == depth)
 		return;
 	switch (depth) {
 		case 8:
 			bus_space_write_1(sc->sc_bustag, sc->sc_regh,
 			    CG14_MCTL, CG14_MCTL_ENABLEVID |
 			    CG14_MCTL_PIXMODE_8 | CG14_MCTL_POWERCTL);
 			sc->sc_depth = 8;
 			/* everything is CLUT1 */
 			for (i = 0; i < CG14_CLUT_SIZE; i++)
 			     sc->sc_xlut->xlut_lut[i] = 0;
 			break;
 @@ -1216,26 +1222,33 @@ cg14_rectfill(struct cgfourteen_softc *s
+	}
+}
 static void
 cg14_rectfill_a(void *cookie, int dstx, int dsty,
     int width, int height, long attr)
+{
 	struct cgfourteen_softc *sc = cookie;
 	cg14_rectfill(sc, dstx, dsty, width, height,
 	    sc->sc_vd.active->scr_ri.ri_devcmap[(attr >> 24 & 0xf)]);
+}
 static inline void
 cg14_set_mask(struct cgfourteen_softc *sc, uint32_t mask)
+{
 	if (mask == sc->sc_mask) return;
 	sc->sc_mask = mask;
 	sx_write(sc->sc_sx, SX_QUEUED(R_MASK), mask);
+}
 /*
  * invert a rectangle, used only to (un)draw the cursor.
  * - does a scanline at a time
  * - does not handle wi > 64 or wi < 4, not that we need it for our fonts
  * - uses all 32bit accesses
  */
 static void
 cg14_invert(struct cgfourteen_softc *sc, int x, int y, int wi, int he)
+{
 	uint32_t addr, pptr, lmask, rmask;
 	int line, cnt, pre, words, pwrds = 0, post, reg;
 	int stride = sc->sc_fb.fb_type.fb_width;
 @@ -1248,47 +1261,47 @@ cg14_invert(struct cgfourteen_softc *sc,
 	pre = x & 3;
 	if (pre != 0) {
 		lmask = 0xffffffff >> pre;
 		pre = 4 - pre;
 		pwrds++;
+	}
 	post = (x + wi) & 3;
 	if (post != 0) {
 		rmask = ~(0xffffffff >> post);
 		pwrds++;
+	}
 	words = (wi + pre + 3) >> 2;
 	cnt = words - pwrds;
 	sx_write(sc->sc_sx, SX_QUEUED(7), 0xe0e0e0e0); /* four red pixels */
 	for (line = 0; line < he; line++) {
 		pptr = addr;
 		/* load a whole scanline */
 		sta(pptr & ~7, ASI_SX, SX_LD(8, words - 1, pptr & 7));
 		reg = 8;
 		if (pre) {
-			sx_write(sc->sc_sx, SX_QUEUED(R_MASK), lmask);
+			cg14_set_mask(sc, lmask);
 			sx_write(sc->sc_sx, SX_INSTRUCTIONS,
 			    SX_ROPB(8, 8, 40, 0));
 			reg++;
+		}
 		if (cnt > 0) {
-			sx_write(sc->sc_sx, SX_QUEUED(R_MASK), 0xffffffff);
+			cg14_set_mask(sc, 0xffffffff);
 			/* XXX handle cnt > 16 */
 			sx_write(sc->sc_sx, SX_INSTRUCTIONS,
 			    SX_ROP(reg, reg, reg + 32, cnt - 1));
 			reg += cnt;
+		}
 		if (post) {
-			sx_write(sc->sc_sx, SX_QUEUED(R_MASK), rmask);
+			cg14_set_mask(sc, rmask);
 			sx_write(sc->sc_sx, SX_INSTRUCTIONS,
 			    SX_ROPB(reg, 7, reg + 32, 0));
 			reg++;
+		}
 		sta(pptr & ~7, ASI_SX, SX_ST(40, words - 1, pptr & 7));
 		addr += stride;
+	}
+}
 static inline void
 cg14_slurp(int reg, uint32_t addr, int cnt)
+{
 	int num;
 @@ -1490,41 +1503,39 @@ cg14_putchar(void *cookie, int row, int
 	sx_write(sc->sc_sx, SX_QUEUED(8), bg);
 	sx_write(sc->sc_sx, SX_QUEUED(9), fg);
 	data = WSFONT_GLYPH(c, font);
 	addr = sc->sc_fb_paddr + x + stride * y;
 	switch (font->stride) {
 		case 1: {
 			uint8_t *data8 = data;
 			uint32_t reg;
 			for (i = 0; i < he; i++) {
 				reg = *data8;
-				sx_write(sc->sc_sx, SX_QUEUED(R_MASK),
+				cg14_set_mask(sc, reg << 24);
 				    reg << 24);
 				sta(addr & ~7, ASI_SX, SX_STBS(8, wi - 1, addr & 7));
 				data8++;
 				addr += stride;
+			}
 			break;
+		}
 		case 2: {
 			uint16_t *data16 = data;
 			uint32_t reg;
 			for (i = 0; i < he; i++) {
 				reg = *data16;
-				sx_write(sc->sc_sx, SX_QUEUED(R_MASK),
+				cg14_set_mask(sc, reg << 16);
 				    reg << 16);
 				sta(addr & ~7, ASI_SX, SX_STBS(8, wi - 1, addr & 7));
 				data16++;
 				addr += stride;
+			}
 			break;
+		}
+	}
 	if (attr & 1)
 		cg14_rectfill(sc, x, y + he - 2, wi, 1, fg);
+}
 static void
 cg14_cursor(void *cookie, int on, int row, int col)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cgfourteenvar.h,v 1.18 2016/04/30 05:23:03 macallan Exp $ */
+/*	$NetBSD: cgfourteenvar.h,v 1.19 2021/12/17 19:27:57 macallan Exp $ */
 /*
  * Copyright (c) 1996
  *	The President and Fellows of Harvard College. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -88,26 +88,27 @@ struct cgfourteen_softc {
 	union 	cg14cmap sc_saveclut; 	/* a place to stash PROM state */
 	size_t	sc_vramsize;
 	int 	sc_depth;	/* current colour depth */
 #if NWSDISPLAY > 0
 	struct  vcons_data sc_vd;
 	struct 	vcons_screen sc_console_screen;
 	struct 	wsscreen_descr sc_defaultscreen_descr;
 	const struct wsscreen_descr *sc_screens[1];
 	struct 	wsscreen_list sc_screenlist;
 	int 	sc_mode;	/* wsdisplay mode - EMUL, DUMB etc. */
 #if NSX > 0
 	struct sx_softc *sc_sx;
 	uint32_t sc_fb_paddr;
 	uint32_t sc_mask;
 	glyphcache sc_gc;
 #endif /* NSX > 0 */
 #endif
 	uint8_t	sc_savexlut[256];
 	uint8_t	sc_savectl;
 	uint8_t	sc_savehwc;
 	struct	cg14ctl  *sc_ctl; 	/* various registers */
 	struct	cg14curs *sc_hwc;
 	struct 	cg14dac	 *sc_dac;
 	struct	cg14xlut *sc_xlut;
 	struct 	cg14clut *sc_clut1;