 @@ -1,14 +1,14 @@
-/*	$NetBSD: wsdisplay_vcons.c,v 1.34 2015/07/19 13:22:42 mlelstv Exp $ */
+/*	$NetBSD: wsdisplay_vcons.c,v 1.35 2015/11/08 16:49:20 christos Exp $ */
 /*-
  * Copyright (c) 2005, 2006 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
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.34 2015/07/19 13:22:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.35 2015/11/08 16:49:20 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 @@ -275,35 +275,41 @@ vcons_init_screen(struct vcons_data *vd,
 	 * we allocate both chars and attributes in one chunk, attributes first
 	 * because they have the (potentially) bigger alignment
 	 */
 #ifdef WSDISPLAY_SCROLLSUPPORT
 	cnt = (ri->ri_rows + WSDISPLAY_SCROLLBACK_LINES) * ri->ri_cols;
 	scr->scr_lines_in_buffer = WSDISPLAY_SCROLLBACK_LINES;
 	scr->scr_current_line = 0;
 	scr->scr_line_wanted = 0;
 	scr->scr_offset_to_zero = ri->ri_cols * WSDISPLAY_SCROLLBACK_LINES;
 	scr->scr_current_offset = scr->scr_offset_to_zero;
 #else
 	cnt = ri->ri_rows * ri->ri_cols;
 #endif
-	scr->scr_attrs = (long *)malloc(cnt * (sizeof(long) +
+	scr->scr_attrs = malloc(cnt * (sizeof(long) +
 	    sizeof(uint32_t)), M_DEVBUF, M_WAITOK);
 	if (scr->scr_attrs == NULL)
 		return ENOMEM;
 	scr->scr_chars = (uint32_t *)&scr->scr_attrs[cnt];
-	ri->ri_ops.allocattr(ri, WS_DEFAULT_FG, WS_DEFAULT_BG, 0, defattr);
+	i = ri->ri_ops.allocattr(ri, WS_DEFAULT_FG, WS_DEFAULT_BG, 0, defattr);
-	scr->scr_defattr = *defattr;
+	if (i != 0) {
 #ifdef DIAGNOSTIC
 		printf("vcons: error allocating attribute %d\n", i);
 #endif
 		scr->scr_defattr = 0;
 	} else
 		scr->scr_defattr = *defattr;
 	/*
 	 * fill the attribute buffer with *defattr, chars with 0x20
 	 * since we don't know if the driver tries to mimic firmware output or
 	 * reset everything we do nothing to VRAM here, any driver that feels
 	 * the need to clear screen or something will have to do it on its own
 	 * Additional screens will start out in the background anyway so
 	 * cleaning or not only really affects the initial console screen
 	 */
 	for (i = 0; i < cnt; i++) {
 		scr->scr_attrs[i] = *defattr;
 		scr->scr_chars[i] = 0x20;
+	}
 @@ -1130,40 +1136,43 @@ vcons_cursor(void *cookie, int on, int r
 		scr->scr_ri.ri_crow = row;
 		scr->scr_ri.ri_ccol = col;
+	}
 	vcons_unlock(scr);
+}
 /* methods to read/write characters via ioctl() */
 static int
 vcons_putwschar(struct vcons_screen *scr, struct wsdisplay_char *wsc)
+{
 	long attr;
 	struct rasops_info *ri;
 	int error;
 	KASSERT(scr != NULL && wsc != NULL);
 	ri = &scr->scr_ri;
 	if (__predict_false((unsigned int)wsc->col > ri->ri_cols ||
 	    (unsigned int)wsc->row > ri->ri_rows))
 			return (EINVAL);
 	if ((wsc->row >= 0) && (wsc->row < ri->ri_rows) && (wsc->col >= 0) &&
 	     (wsc->col < ri->ri_cols)) {
-		ri->ri_ops.allocattr(ri, wsc->foreground, wsc->background,
+		error = ri->ri_ops.allocattr(ri, wsc->foreground,
-		    wsc->flags, &attr);
+		    wsc->background, wsc->flags, &attr);
 		if (error)
 			return error;
 		vcons_putchar(ri, wsc->row, wsc->col, wsc->letter, attr);
 #ifdef VCONS_DEBUG
 		printf("vcons_putwschar(%d, %d, %x, %lx\n", wsc->row, wsc->col,
 		    wsc->letter, attr);
 #endif
 		return 0;
 	} else
 		return EINVAL;
+}
 static int
 vcons_getwschar(struct vcons_screen *scr, struct wsdisplay_char *wsc)
+{