 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_rascons.c,v 1.14 2020/03/16 22:02:37 macallan Exp $	*/
+/*	$NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin 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: ofw_rascons.c,v 1.14 2020/03/16 22:02:37 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin Exp $");
 #include "wsdisplay.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/ofw/openfirm.h>
 @@ -77,26 +77,28 @@ struct wsscreen_descr rascons_stdscreen
 , 0,
 	WSSCREEN_REVERSE
 };
 int
 rascons_cnattach(void)
+{
 	struct rasops_info *ri = &rascons_console_screen.scr_ri;
 	long defattr;
 	int crow = 0;
 	/* get current cursor position */
 	OF_interpret("line#", 0, 1, &crow);
 	if (crow < 0)
 		crow = 0;
 	/* move (rom monitor) cursor to the lowest line - 1 */
 	/* XXXX - Why? */
 #if 0
 	OF_interpret("#lines 2 - to line#", 0, 0);
 #endif
 	wsfont_init();
 	if (copy_rom_font() == 0) {
 #if !defined(OFWOEA_WSCONS_NO_ROM_FONT)
 		romfont_loaded = 1;
 #endif /* !OFWOEA_WSCONS_NO_ROM_FONT */
+	}
 @@ -155,43 +157,54 @@ rascons_add_rom_font(void)
+	}
+}
 void
 rascons_finalize(void)
+{
 	struct rasops_info *ri = &rascons_console_screen.scr_ri;
 	long defattr;
 	int crow = 0;
 	if (needs_finalize == 0) return;
 	/* get current cursor position */
-	if (romfont_loaded) OF_interpret("line#", 0, 1, &crow);
+	if (romfont_loaded) {
 		OF_interpret("line#", 0, 1, &crow);
 		if (crow < 0)
 			crow = 0;
+	}
 	ri->ri_ops.allocattr(ri, 0, 0, 0, &defattr);
 	wsdisplay_preattach(&rascons_stdscreen, ri, 0, uimax(0,
 		    uimin(crow, ri->ri_rows - 1)), defattr);
+}
 static int
 copy_rom_font(void)
+{
 	u_char *romfont;
 	int char_width, char_height, stride;
 	int chosen, mmu, m, e, size;
-	/* Get ROM FONT address. */
+	/*
 	 * Get ROM FONT address.
+	 *
 	 * For some machines like ``PowerMac11,2'', Open Firmware does not
 	 * initialize console-related variables when auto-boot? is true;
 	 * -1 is returned instead of correct value. Fall back to wsfont
 	 * embedded in kernel in this case.
 	 */
 	OF_interpret("font-adr", 0, 1, &romfont);
-	if (romfont == NULL)
+	if (romfont == NULL || romfont == (u_char *)-1)
 		return -1;
 	chosen = OF_finddevice("/chosen");
 	OF_getprop(chosen, "mmu", &mmu, 4);
 	/*
 	 * Convert to physcal address.  We cannot access to Open Firmware's
 	 * virtual address space.
 	 */
 	OF_call_method("translate", mmu, 1, 3, romfont, &romfont, &m, &e);
 	/* Get character size */
 	OF_interpret("char-width", 0, 1, &char_width);