 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofb.c,v 1.70.32.2 2021/04/02 22:17:40 thorpej Exp $	*/
+/*	$NetBSD: ofb.c,v 1.70.32.3 2021/04/24 18:23:09 thorpej Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.70.32.2 2021/04/02 22:17:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.70.32.3 2021/04/24 18:23:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/kauth.h>
 #include <sys/lwp.h>
 #include <dev/pci/pcidevs.h>
 @@ -207,27 +207,29 @@ ofbattach(device_t parent, device_t self
 	    sizeof(sc->sc_addrs)) == -1) {
 		sc->sc_node = OF_parent(sc->sc_node);
 		OF_getprop(sc->sc_node, "assigned-addresses", sc->sc_addrs,
 		    sizeof(sc->sc_addrs));
+	}
 	ofb_init_cmap(sc);
 	a.console = console;
 	a.scrdata = &ofb_screenlist;
 	a.accessops = &ofb_accessops;
 	a.accesscookie = &sc->vd;
-	config_found(self, &a, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, &a, wsemuldisplaydevprint,
 	    CFARG_IATTR, "wsemuldisplaydev",
 	    CFARG_EOL);
 	config_found(self, aux, ofb_drm_print,
 	    CFARG_IATTR, "drm",
 	    CFARG_EOL);
+}
 static int
 ofb_drm_print(void *aux, const char *pnp)
+{
 	if (pnp)
 		aprint_normal("direct rendering for %s", pnp);
 	return (UNSUPP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vga_raster.c,v 1.48.4.1 2021/03/21 21:09:12 thorpej Exp $	*/
+/*	$NetBSD: vga_raster.c,v 1.48.4.2 2021/04/24 18:23:09 thorpej Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Bang Jun-Young
  * Copyright (c) 2004 Julio M. Merino Vidal
  * 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
 @@ -46,27 +46,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.48.4.1 2021/03/21 21:09:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.48.4.2 2021/04/24 18:23:09 thorpej Exp $");
 #include "opt_vga.h"
 #include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 @@ -538,27 +538,29 @@ vga_common_attach(struct vga_softc *sc,
+	}
 	vc->vc_type = type;
 	vc->vc_funcs = vf;
 	sc->sc_vc = vc;
 	vc->softc = sc;
 	aa.console = console;
 	aa.scrdata = (vc->hdl.vh_mono ? &vga_screenlist_mono : &vga_screenlist);
 	aa.accessops = &vga_raster_accessops;
 	aa.accesscookie = vc;
-	config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
 	    CFARG_IATTR, "wsemuldisplaydev",
 	    CFARG_EOL);
+}
 int
 vga_cndetach(void)
+{
 	struct vga_config *vc;
 	struct vga_handle *vh;
 	vc = &vga_console_vc;
 	vh = &vc->hdl;
 	if (vgaconsole) {
 		wsdisplay_cndetach();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machfb.c,v 1.103.4.2 2021/04/02 22:17:44 thorpej Exp $	*/
+/*	$NetBSD: machfb.c,v 1.103.4.3 2021/04/24 18:23:09 thorpej Exp $	*/
 /*
  * Copyright (c) 2002 Bang Jun-Young
  * Copyright (c) 2005, 2006, 2007 Michael Lorenz
  * 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
 @@ -24,27 +24,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Some code is derived from ATI Rage Pro and Derivatives Programmer's Guide.
  */
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0,
-	"$NetBSD: machfb.c,v 1.103.4.2 2021/04/02 22:17:44 thorpej Exp $");
+	"$NetBSD: machfb.c,v 1.103.4.3 2021/04/24 18:23:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/edidvar.h>
 @@ -775,27 +775,29 @@ mach64_attach(device_t parent, device_t
 	mach64_clearscreen(sc);
 	mach64_init_lut(sc);
 	if (sc->sc_console)
 		vcons_replay_msgbuf(&mach64_console_screen);
 	machfb_blank(sc, 0);	/* unblank the screen */
 	aa.console = sc->sc_console;
 	aa.scrdata = &mach64_screenlist;
 	aa.accessops = &sc->sc_accessops;
 	aa.accesscookie = &sc->vd;
-	config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, &aa, wsemuldisplaydevprint,
 	    CFARG_IATTR, "wsemuldisplaydev",
 	    CFARG_EOL);
 #if 0
 	/* XXX
 	 * turns out some firmware doesn't turn these back on when needed
 	 * so we need to turn them off only when mapping vram in
 	 * WSDISPLAYIO_MODE_DUMB would overlap ( unlikely but far from
 	 * impossible )
 	 */
 	if (use_mmio) {
 		/*
 		 * Now that we took over, turn off the aperture registers if we
 		 * don't use them. Can't do this earlier since on some hardware
 		 * we use firmware calls as early console output which may in
 		 * turn try to access these registers.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeonfb.c,v 1.113.2.2 2021/04/02 22:17:44 thorpej Exp $ */
+/*	$NetBSD: radeonfb.c,v 1.113.2.3 2021/04/24 18:23:09 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * 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
 @@ -60,27 +60,27 @@
  * portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, VA LINUX SYSTEMS AND/OR
  * THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.113.2.2 2021/04/02 22:17:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.113.2.3 2021/04/24 18:23:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 @@ -1003,27 +1003,29 @@ radeonfb_attach(device_t parent, device_
 #ifdef SPLASHSCREEN
 			if (splash_render(&dp->rd_splash,
 			    SPLASH_F_CENTER|SPLASH_F_FILL) == 0)
 				SCREEN_DISABLE_DRAWING(&dp->rd_vscreen);
 #endif
+		}
 		aa.console = dp->rd_console;
 		aa.scrdata = &dp->rd_wsscreenlist;
 		aa.accessops = &radeonfb_accessops;
 		aa.accesscookie = &dp->rd_vd;
-		config_found(sc->sc_dev, &aa, wsemuldisplaydevprint, CFARG_EOL);
+		config_found(sc->sc_dev, &aa, wsemuldisplaydevprint,
 		    CFARG_IATTR, "wsemuldisplaydev",
 		    CFARG_EOL);
 		radeonfb_blank(dp, 0);
 		/* Initialise delayed lvds operations for backlight. */
 		callout_init(&dp->rd_bl_lvds_co, 0);
 		callout_setfunc(&dp->rd_bl_lvds_co,
 				radeonfb_lvds_callout, dp);
 		dp->rd_bl_on = 1;
 		if (sc->sc_flags & RFB_MOB) {
 			dp->rd_bl_level = radeonfb_get_backlight(dp);
 		} else
 			dp->rd_bl_level = 128;

 @@ -1,14 +1,14 @@
-/* $NetBSD: unichromefb.c,v 1.19.34.2 2021/04/02 22:17:44 thorpej Exp $ */
+/* $NetBSD: unichromefb.c,v 1.19.34.3 2021/04/24 18:23:09 thorpej Exp $ */
 /*-
  * Copyright (c) 2006, 2008 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -41,27 +41,27 @@
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
  * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.19.34.2 2021/04/02 22:17:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.19.34.3 2021/04/24 18:23:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 @@ -341,27 +341,29 @@ unichromefb_attach(device_t parent, devi
 	unichromefb_stdscreen.ncols = ri->ri_cols;
 	unichromefb_stdscreen.nrows = ri->ri_rows;
 	unichromefb_stdscreen.textops = &ri->ri_ops;
 	unichromefb_stdscreen.capabilities = ri->ri_caps;
 	unichromefb_stdscreen.modecookie = NULL;
 	wsdisplay_cnattach(&unichromefb_stdscreen, ri, 0, 0, defattr);
 	aa.console = 1; /* XXX */
 	aa.scrdata = &unichromefb_screenlist;
 	aa.accessops = &unichromefb_accessops;
 	aa.accesscookie = &sc->sc_vd;
-	config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, &aa, wsemuldisplaydevprint,
 	    CFARG_IATTR, "wsemuldisplaydev",
 	    CFARG_EOL);
 	config_found(self, opaque, unichromefb_drm_print,
 	    CFARG_IATTR, "drm",
 	    CFARG_EOL);
 	return;
+}
 static int
 unichromefb_drm_print(void *opaque, const char *pnp)
+{
 	if (pnp)
 		aprint_normal("drm at %s", pnp);