 @@ -1,14 +1,14 @@
-/* $NetBSD: vga.c,v 1.109 2012/08/09 23:56:35 uwe Exp $ */
+/* $NetBSD: vga.c,v 1.110 2013/01/21 19:49:15 mlelstv 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: vga.c,v 1.109 2012/08/09 23:56:35 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.110 2013/01/21 19:49:15 mlelstv Exp $");
 /* for WSCONS_SUPPORT_PCVTFONTS */
 #include "opt_wsdisplay_compat.h"
 /* for WSDISPLAY_CUSTOM_BORDER */
 #include "opt_wsdisplay_border.h"
 /* for WSDISPLAY_CUSTOM_OUTPUT */
 #include "opt_wsmsgattrs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -101,43 +101,43 @@ struct vgascreen {
 	/* videostate */
 	struct egavga_font *fontset1, *fontset2;
 	/* font data */
 	int mindispoffset, maxdispoffset;
 	int vga_rollover;
 	int visibleoffset;
 };
 static int vgaconsole, vga_console_type, vga_console_attached;
 static struct vgascreen vga_console_screen;
 static struct vga_config vga_console_vc;
-struct egavga_font *egavga_getfont(struct vga_config *, struct vgascreen *,
+static struct egavga_font *egavga_getfont(struct vga_config *, struct vgascreen *,
 				   const char *, int);
-void egavga_unreffont(struct vga_config *, struct egavga_font *);
+static void egavga_unreffont(struct vga_config *, struct egavga_font *);
-int vga_selectfont(struct vga_config *, struct vgascreen *, const char *,
+static int vga_selectfont(struct vga_config *, struct vgascreen *, const char *,
 				   const char *);
-void vga_init_screen(struct vga_config *, struct vgascreen *,
+static void vga_init_screen(struct vga_config *, struct vgascreen *,
 		     const struct wsscreen_descr *, int, long *);
-void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t);
+static void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t);
 static void vga_setfont(struct vga_config *, struct vgascreen *);
 static int vga_mapchar(void *, int, unsigned int *);
-void vga_putchar(void *, int, int, u_int, long);
+static void vga_putchar(void *, int, int, u_int, long);
 static int vga_allocattr(void *, int, int, int, long *);
 static void vga_copyrows(void *, int, int, int);
 #ifdef WSDISPLAY_SCROLLSUPPORT
-void vga_scroll (void *, void *, int);
+static void vga_scroll (void *, void *, int);
 #endif
 const struct wsdisplay_emulops vga_emulops = {
 	pcdisplay_cursor,
 	vga_mapchar,
 	vga_putchar,
 	pcdisplay_copycols,
 	pcdisplay_erasecols,
 	vga_copyrows,
 	pcdisplay_eraserows,
 	vga_allocattr,
 #ifdef WSDISPLAY_CUSTOM_OUTPUT
 	pcdisplay_replaceattr,
 @@ -277,27 +277,30 @@ const struct wsscreen_list vga_screenlis
 static int	vga_ioctl(void *, void *, u_long, void *, int, struct lwp *);
 static paddr_t	vga_mmap(void *, void *, off_t, int);
 static int	vga_alloc_screen(void *, const struct wsscreen_descr *,
 				 void **, int *, int *, long *);
 static void	vga_free_screen(void *, void *);
 static int	vga_show_screen(void *, void *, int,
 				void (*)(void *, int, int), void *);
 static int	vga_load_font(void *, void *, struct wsdisplay_font *);
 #ifdef WSDISPLAY_CUSTOM_BORDER
 static int	vga_getborder(struct vga_config *, u_int *);
 static int	vga_setborder(struct vga_config *, u_int);
 #endif /* WSDISPLAY_CUSTOM_BORDER */
-void vga_doswitch(struct vga_config *);
+static void vga_doswitch(struct vga_config *);
 static void    vga_save_palette(struct vga_config *);
 static void    vga_restore_palette(struct vga_config *);
 const struct wsdisplay_accessops vga_accessops = {
 	vga_ioctl,
 	vga_mmap,
 	vga_alloc_screen,
 	vga_free_screen,
 	vga_show_screen,
 	vga_load_font,
 	NULL,
 #ifdef WSDISPLAY_SCROLLSUPPORT
 	vga_scroll,
 #else
 	NULL,
 @@ -305,27 +308,27 @@ const struct wsdisplay_accessops vga_acc
 };
 /*
  * We want at least ASCII 32..127 be present in the
  * first font slot.
  */
 #define vga_valid_primary_font(f) \
 	(f->wsfont->encoding == WSDISPLAY_FONTENC_IBM || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO2 || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO7 || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_KOI8_R)
-struct egavga_font *
+static struct egavga_font *
 egavga_getfont(struct vga_config *vc, struct vgascreen *scr, const char *name,
 	       int primary)
+{
 	struct egavga_font *f;
 	int cookie;
 	struct wsdisplay_font *wf;
 	TAILQ_FOREACH(f, &vc->vc_fontlist, next) {
 		if (wsfont_matches(f->wsfont, name,
 , scr->pcs.type->fontheight, 0, WSFONT_FIND_BITMAP) &&
 		    (!primary || vga_valid_primary_font(f))) {
 #ifdef VGAFONTDEBUG
 			if (scr != &vga_console_screen || vga_console_attached)
 @@ -366,49 +369,49 @@ egavga_getfont(struct vga_config *vc, st
 	f->slot = -1; /* not yet loaded */
 	f->usecount = 0; /* incremented below */
 	TAILQ_INSERT_TAIL(&vc->vc_fontlist, f, next);
 found:
 	f->usecount++;
 #ifdef VGAFONTDEBUG
 	if (scr != &vga_console_screen || vga_console_attached)
 		printf("vga_getfont: usecount=%d\n", f->usecount);
 #endif
 	return (f);
+}
-void
+static void
 egavga_unreffont(struct vga_config *vc, struct egavga_font *f)
+{
 	f->usecount--;
 #ifdef VGAFONTDEBUG
 	printf("vga_unreffont: usecount=%d\n", f->usecount);
 #endif
 	if (f->usecount == 0 && f->cookie != -1) {
 		TAILQ_REMOVE(&vc->vc_fontlist, f, next);
 		if (f->slot != -1) {
 			KASSERT(vc->vc_fonts[f->slot] == f);
 			vc->vc_fonts[f->slot] = 0;
+		}
 		wsfont_unlock(f->cookie);
 #ifdef VGA_CONSOLE_SCREENTYPE
 		if (f != &vga_consolefont)
 #endif
 		free(f, M_DEVBUF);
+	}
+}
-int
+static int
 vga_selectfont(struct vga_config *vc, struct vgascreen *scr, const char *name1,
 	       const char *name2)
+{
 	const struct wsscreen_descr *type = scr->pcs.type;
 	struct egavga_font *f1, *f2;
 	f1 = egavga_getfont(vc, scr, name1, 1);
 	if (!f1)
 		return (ENXIO);
 	if (VGA_SCREEN_CANTWOFONTS(type) && name2) {
 		f2 = egavga_getfont(vc, scr, name2, 0);
 		if (!f2) {
 @@ -427,27 +430,27 @@ vga_selectfont(struct vga_config *vc, st
 			    f2->wsfont->name, f2->slot);
 		printf("\n");
+	}
 #endif
 	if (scr->fontset1)
 		egavga_unreffont(vc, scr->fontset1);
 	scr->fontset1 = f1;
 	if (scr->fontset2)
 		egavga_unreffont(vc, scr->fontset2);
 	scr->fontset2 = f2;
 	return (0);
+}
-void
+static void
 vga_init_screen(struct vga_config *vc, struct vgascreen *scr,
 		const struct wsscreen_descr *type, int existing, long *attrp)
+{
 	int cpos;
 	int res;
 	scr->cfg = vc;
 	scr->pcs.hdl = (struct pcdisplay_handle *)&vc->hdl;
 	scr->pcs.type = type;
 	scr->pcs.active = existing;
 	scr->mindispoffset = 0;
 	if (vc->vc_quirks & VGA_QUIRK_NOFASTSCROLL)
 		scr->maxdispoffset = 0;
 @@ -513,27 +516,27 @@ vga_init_screen(struct vga_config *vc, s
 	if (vga_selectfont(vc, scr, 0, 0)) {
 		if (scr == &vga_console_screen)
 			panic("vga_init_screen: no font");
 		else
 			printf("vga_init_screen: no font\n");
+	}
 	if (existing)
 		vga_setfont(vc, scr);
 	vc->nscreens++;
 	LIST_INSERT_HEAD(&vc->screens, scr, next);
+}
-void
+static void
 vga_init(struct vga_config *vc, bus_space_tag_t iot, bus_space_tag_t memt)
+{
 	struct vga_handle *vh = &vc->hdl;
 	uint8_t mor;
 	int i;
 	vh->vh_iot = iot;
 	vh->vh_memt = memt;
 	if (bus_space_map(vh->vh_iot, 0x3c0, 0x10, 0, &vh->vh_ioh_vga))
 		panic("vga_init: couldn't map vga io");
 	/* read "misc output register" */
 @@ -765,27 +768,27 @@ vga_set_video(struct vga_config *vc, int
 		vga_6845_write(&vc->hdl, mode, val | 0x80);
 #endif
 	} else {					/* blank screen */
 		val = vga_ts_read(&vc->hdl, mode);
 		vga_ts_write(&vc->hdl, mode, val | VGA_TS_MODE_BLANK);
 #ifndef VGA_NO_VBLANK
 		val = vga_6845_read(&vc->hdl, mode);
 		vga_6845_write(&vc->hdl, mode, val & ~0x80);
 #endif
+	}
 	vga_ts_write(&vc->hdl, syncreset, 0x03);
+}
-int
+static int
 vga_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
+{
 	struct vga_config *vc = v;
 	struct vgascreen *scr = vs;
 	const struct vga_funcs *vf = vc->vc_funcs;
 	switch (cmd) {
 	case WSDISPLAYIO_SMODE:
 		if (*(u_int *)data == WSDISPLAYIO_MODE_EMUL)
 			vga_restore_palette(vc);
 		return 0;
 	case WSDISPLAYIO_GTYPE:
 @@ -848,27 +851,27 @@ vga_mmap(void *v, void *vs, off_t offset
+{
 	struct vga_config *vc = v;
 	const struct vga_funcs *vf = vc->vc_funcs;
 	if (vc->vc_funcs == NULL)
 		return (-1);
 	if (vf->vf_mmap == NULL)
 		return (-1);
 	return ((*vf->vf_mmap)(v, offset, prot));
+}
-int
+static int
 vga_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
 		 int *curxp, int *curyp, long *defattrp)
+{
 	struct vga_config *vc = v;
 	struct vgascreen *scr;
 	if (vc->nscreens == 1) {
 		struct vgascreen *scr1 = vc->screens.lh_first;
 		/*
 		 * When allocating the second screen, get backing store
 		 * for the first one too.
 		 * XXX We could be more clever and use video RAM.
 		 */
 @@ -883,27 +886,27 @@ vga_alloc_screen(void *v, const struct w
 	if (vc->nscreens > 1) {
 		scr->pcs.mem = malloc(type->ncols * type->nrows * 2,
 		    M_DEVBUF, M_WAITOK);
 		pcdisplay_eraserows(&scr->pcs, 0, type->nrows, *defattrp);
+	}
 	*cookiep = scr;
 	*curxp = scr->pcs.cursorcol;
 	*curyp = scr->pcs.cursorrow;
 	return (0);
+}
-void
+static void
 vga_free_screen(void *v, void *cookie)
+{
 	struct vgascreen *vs = cookie;
 	struct vga_config *vc = vs->cfg;
 	LIST_REMOVE(vs, next);
 	vc->nscreens--;
 	if (vs->fontset1)
 		egavga_unreffont(vc, vs->fontset1);
 	if (vs->fontset2)
 		egavga_unreffont(vc, vs->fontset2);
 	if (vs != &vga_console_screen)
 @@ -963,52 +966,52 @@ vga_setfont(struct vga_config *vc, struc
 	if (scr->fontset2)
 		vga_usefont(vc, scr->fontset2);
 	fontslot1 = (scr->fontset1 ? scr->fontset1->slot : 0);
 	fontslot2 = (scr->fontset2 ? scr->fontset2->slot : fontslot1);
 	if (vc->currentfontset1 != fontslot1 ||
 	    vc->currentfontset2 != fontslot2) {
 		vga_setfontset(&vc->hdl, fontslot1, fontslot2);
 		vc->currentfontset1 = fontslot1;
 		vc->currentfontset2 = fontslot2;
+	}
+}
-int
+static int
 vga_show_screen(void *v, void *cookie, int waitok,
 		void (*cb)(void *, int, int), void *cbarg)
+{
 	struct vgascreen *scr = cookie, *oldscr;
 	struct vga_config *vc = scr->cfg;
 	oldscr = vc->active; /* can be NULL! */
 	if (scr == oldscr) {
 		return (0);
+	}
 	vc->wantedscreen = cookie;
 	vc->switchcb = cb;
 	vc->switchcbarg = cbarg;
 	if (cb) {
 		callout_reset(&vc->vc_switch_callout, 0,
 		    (void(*)(void *))vga_doswitch, vc);
 		return (EAGAIN);
+	}
 	vga_doswitch(vc);
 	return (0);
+}
-void
+static void
 vga_doswitch(struct vga_config *vc)
+{
 	struct vgascreen *scr, *oldscr;
 	struct vga_handle *vh = &vc->hdl;
 	const struct wsscreen_descr *type;
 	scr = vc->wantedscreen;
 	if (!scr) {
 		printf("vga_doswitch: disappeared\n");
 		(*vc->switchcb)(vc->switchcbarg, EIO, 0);
 		return;
+	}
 	type = scr->pcs.type;
 @@ -1442,27 +1445,27 @@ vga_mapchar(void *id, int uni, u_int *in
 	if (scr->fontset2) {
 		KASSERT(VGA_SCREEN_CANTWOFONTS(scr->pcs.type));
 		res2 = _vga_mapchar(id, scr->fontset2, uni, &idx2);
+	}
 	if (res2 > res1) {
 		*index = idx2 | 0x0800; /* attribute bit 3 */
 		return (res2);
+	}
 	*index = idx1;
 	return (res1);
+}
 #ifdef WSDISPLAY_SCROLLSUPPORT
-void
+static void
 vga_scroll(void *v, void *cookie, int lines)
+{
 	struct vga_config *vc = v;
 	struct vgascreen *scr = cookie;
 	struct vga_handle *vh = &vc->hdl;
 	if (lines == 0) {
 		if (scr->pcs.visibleoffset == scr->pcs.dispoffset)
 			return;
 		scr->pcs.visibleoffset = scr->pcs.dispoffset;
+	}
 	else {
 @@ -1484,27 +1487,27 @@ vga_scroll(void *v, void *cookie, int li
 		st = (scr->pcs.dispoffset - ul + we) % we;
 		if (p < margin)
 			p = 0;
 		if (p > st - margin)
 			p = st;
 		scr->pcs.visibleoffset = (p + ul) % we;
+	}
 	vga_6845_write(vh, startadrh, scr->pcs.visibleoffset >> 9);
 	vga_6845_write(vh, startadrl, scr->pcs.visibleoffset >> 1);
+}
 #endif
-void
+static void
 vga_putchar(void *c, int row, int col, u_int uc, long attr)
+{
 	pcdisplay_putchar(c, row, col, uc, attr);
+}
 #ifdef WSDISPLAY_CUSTOM_BORDER
 static int
 vga_getborder(struct vga_config *vc, u_int *valuep)
+{
 	struct vga_handle *vh = &vc->hdl;
 	u_int idx;
 	uint8_t value;
 @@ -1540,45 +1543,45 @@ vga_setborder(struct vga_config *vc, u_i
 void
 vga_resume(struct vga_softc *sc)
+{
 #ifdef VGA_RESET_ON_RESUME
 	vga_initregs(&sc->sc_vc->hdl);
 #endif
 #ifdef PCDISPLAY_SOFTCURSOR
 	/* Disable the hardware cursor */
 	vga_6845_write(&sc->sc_vc->hdl, curstart, 0x20);
 	vga_6845_write(&sc->sc_vc->hdl, curend, 0x00);
 #endif
+}
-void
+static void
 vga_save_palette(struct vga_config *vc)
+{
 	struct vga_handle *vh = &vc->hdl;
 	size_t i;
 	uint8_t *palette = vc->palette;
 	if (vh->vh_mono)
 		return;
 	vga_raw_write(vh, VGA_DAC_PELMASK, 0xff);
 	vga_raw_write(vh, VGA_DAC_ADDRR, 0x00);
 	for (i = 0; i < sizeof(vc->palette); i++)
 		*palette++ = vga_raw_read(vh, VGA_DAC_PALETTE);
 	vga_reset_state(vh);			/* reset flip/flop */
+}
-void
+static void
 vga_restore_palette(struct vga_config *vc)
+{
 	struct vga_handle *vh = &vc->hdl;
 	size_t i;
 	uint8_t *palette = vc->palette;
 	if (vh->vh_mono)
 		return;
 	vga_raw_write(vh, VGA_DAC_PELMASK, 0xff);
 	vga_raw_write(vh, VGA_DAC_ADDRW, 0x00);
 	for (i = 0; i < sizeof(vc->palette); i++)
 		vga_raw_write(vh, VGA_DAC_PALETTE, *palette++);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vga_raster.c,v 1.35 2012/01/11 20:41:28 macallan Exp $	*/
+/*	$NetBSD: vga_raster.c,v 1.36 2013/01/21 19:49:15 mlelstv 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.35 2012/01/11 20:41:28 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.36 2013/01/21 19:49:15 mlelstv Exp $");
 #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>
 #include <dev/ic/mc6845reg.h>
 @@ -362,27 +362,27 @@ vga_cnattach(bus_space_tag_t iot, bus_sp
 	vga_console_screen.active = 1;
 	vga_console_vc.active = &vga_console_screen;
 	wsdisplay_cnattach(scr, &vga_console_screen,
 	    vga_console_screen.cursorcol, vga_console_screen.cursorrow,
 	    defattr);
 	vgaconsole = 1;
 	vga_console_type = type;
 	return (0);
+}
-void
+static void
 vga_raster_init(struct vga_config *vc, bus_space_tag_t iot,
     bus_space_tag_t memt)
+{
 	struct vga_handle *vh = &vc->hdl;
 	u_int8_t mor;
 	struct vga_raster_font *vf;
 	vh->vh_iot = iot;
 	vh->vh_memt = memt;
 	if (bus_space_map(vh->vh_iot, 0x3c0, 0x10, 0, &vh->vh_ioh_vga))
 		panic("vga_raster_init: couldn't map vga io");
 @@ -429,27 +429,27 @@ vga_raster_init(struct vga_config *vc, b
 			cookie = wsfont_find(NULL, 0, 0, 0,
 			    WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R,
 			    WSFONT_FIND_BITMAP);
 		if (cookie == -1 || wsfont_lock(cookie, &wf))
 			panic("vga_raster_init: can't load console font");
 		vf->font = wf;
 	} else {
 		vga_load_builtinfont(vh, builtinfont_data, 0, 256);
 		vf->font = &builtinfont;
+	}
 	LIST_INSERT_HEAD(&vc->vc_fontlist, vf, next);
+}
-void
+static void
 vga_raster_init_screen(struct vga_config *vc, struct vgascreen *scr,
     const struct wsscreen_descr *type, int existing, long *attrp)
+{
 	int cpos;
 	int res;
 	struct vga_handle *vh;
 	scr->cfg = vc;
 	scr->hdl = &vc->hdl;
 	scr->type = type;
 	scr->mindispoffset = 0;
 	scr->maxdispoffset = scr->dispoffset +
 	    type->nrows * type->ncols * type->fontheight;
 @@ -674,27 +674,27 @@ vga_raster_mmap(void *v, void *vs, off_t
+{
 	struct vga_config *vc = v;
 	const struct vga_funcs *vf = vc->vc_funcs;
 	if (vc->vc_funcs == NULL)
 		return (-1);
 	if (vf->vf_mmap == NULL)
 		return (-1);
 	return ((*vf->vf_mmap)(v, offset, prot));
+}
-int
+static int
 vga_raster_alloc_screen(void *v, const struct wsscreen_descr *type,
     void **cookiep, int *curxp, int *curyp, long *defattrp)
+{
 	struct vga_config *vc = v;
 	struct vgascreen *scr;
 	if (vc->nscreens == 1) {
 		vc->screens.lh_first->mem = boot_scrmem;
+	}
 	scr = malloc(sizeof(struct vgascreen), M_DEVBUF, M_WAITOK);
 	vga_raster_init_screen(vc, scr, type, vc->nscreens == 0, defattrp);
 @@ -705,69 +705,69 @@ vga_raster_alloc_screen(void *v, const s
 	} else {
 		scr->mem = malloc(sizeof(struct vga_scrmem) *
 		    type->ncols * type->nrows, M_DEVBUF, M_WAITOK);
 		vga_raster_eraserows(scr, 0, type->nrows, *defattrp);
+	}
 	*cookiep = scr;
 	*curxp = scr->cursorcol;
 	*curyp = scr->cursorrow;
 	return (0);
+}
-void
+static void
 vga_raster_free_screen(void *v, void *cookie)
+{
 	struct vgascreen *vs = cookie;
 	struct vga_config *vc = vs->cfg;
 	LIST_REMOVE(vs, next);
 	vc->nscreens--;
 	if (vs != &vga_console_screen)
 		free(vs, M_DEVBUF);
 	else
 		panic("vga_raster_free_screen: console");
 	if (vc->active == vs)
 		vc->active = 0;
+}
-int
+static int
 vga_raster_show_screen(void *v, void *cookie, int waitok,
     void (*cb)(void *, int, int), void *cbarg)
+{
 	struct vgascreen *scr = cookie, *oldscr;
 	struct vga_config *vc = scr->cfg;
 	oldscr = vc->active; /* can be NULL! */
 	if (scr == oldscr) {
 		return (0);
+	}
 	vc->wantedscreen = cookie;
 	vc->switchcb = cb;
 	vc->switchcbarg = cbarg;
 	if (cb) {
 		callout_reset(&vc->vc_switch_callout, 0,
 		    (void(*)(void *))vga_switch_screen, vc);
 		return (EAGAIN);
+	}
 	vga_switch_screen(vc);
 	return (0);
+}
-void
+static void
 vga_switch_screen(struct vga_config *vc)
+{
 	struct vgascreen *scr, *oldscr;
 	struct vga_handle *vh = &vc->hdl;
 	const struct wsscreen_descr *type;
 	scr = vc->wantedscreen;
 	if (!scr) {
 		printf("vga_switch_screen: disappeared\n");
 		(*vc->switchcb)(vc->switchcbarg, EIO, 0);
 		return;
+	}
 	type = scr->type;
 @@ -819,27 +819,27 @@ vga_switch_screen(struct vga_config *vc)
 		(*vc->switchcb)(vc->switchcbarg, 0, 0);
+}
 static int
 vga_raster_load_font(void *v, void *id,
     struct wsdisplay_font *data)
+{
 	/* XXX */
 	printf("vga_raster_load_font: called\n");
 	return (0);
+}
-void
+static void
 vga_raster_setup_font(struct vga_config *vc, struct vgascreen *scr)
+{
 	struct vga_raster_font *vf;
 	struct wsdisplay_font *wf;
 	int cookie;
 	LIST_FOREACH(vf, &vc->vc_fontlist, next) {
 		if (wsfont_matches(vf->font, 0, 0, scr->type->fontheight, 0,
 		    WSFONT_FIND_BITMAP)) {
 			scr->encoding = vf->font->encoding;
 			LIST_INSERT_HEAD(&scr->fontset, vf, next);
 			return;
+		}
 @@ -854,27 +854,27 @@ vga_raster_setup_font(struct vga_config
 		return;
 	vf = malloc(sizeof(struct vga_raster_font), M_DEVBUF, M_NOWAIT);
 	if (!vf) {
 		wsfont_unlock(cookie);
 		return;
+	}
 	vf->font = wf;
 	scr->encoding = vf->font->encoding;
 	LIST_INSERT_HEAD(&scr->fontset, vf, next);
+}
-void
+static void
 vga_setup_regs(struct videomode *mode, struct vga_moderegs *regs)
+{
 	int i;
 	int depth = 4;			/* XXXBJY hardcoded for now */
 	const u_int8_t palette[] = {
 x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07,
 x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
 	};
 	/*
 	 * Compute hsync and vsync polarity.
 	 */
 	if ((mode->flags & (VID_PHSYNC | VID_NHSYNC))
 @@ -979,27 +979,27 @@ vga_setup_regs(struct videomode *mode, s
 	/* Set palette registers. */
 	for (i = 0; i < 16; i++)
 		regs->atc[i] = palette[i];
 	if (depth == 4)
 		regs->atc[16] = 0x01;	/* XXXBJY was 0x81 in XFree86 */
 	else
 		regs->atc[16] = 0x41;
 	regs->atc[17] = 0x00;		/* XXXBJY just a guess */
 	regs->atc[18] = 0x0f;
 	regs->atc[19] = 0x00;
 	regs->atc[20] = 0x00;
+}
-void
+static void
 vga_set_mode(struct vga_handle *vh, struct vga_moderegs *regs)
+{
 	int i;
 	/* Disable display. */
 	vga_ts_write(vh, mode, vga_ts_read(vh, mode) | VGA_TS_MODE_BLANK);
 	/* Write misc output register. */
 	bus_space_write_1(vh->vh_iot, vh->vh_ioh_vga, VGA_MISC_DATAW,
 	    regs->miscout);
 	/* Set synchronous reset. */
 	vga_ts_write(vh, syncreset, 0x01);
 @@ -1017,27 +1017,27 @@ vga_set_mode(struct vga_handle *vh, stru
 	/* Write graphics display registers. */
 	for (i = 0; i < VGA_GDC_NREGS; i++)
 		_vga_gdc_write(vh, i, regs->gdc[i]);
 	/* Write attribute controller registers. */
 	for (i = 0; i < VGA_ATC_NREGS; i++)
 		_vga_attr_write(vh, i, regs->atc[i]);
 	/* Enable display. */
 	vga_ts_write(vh, mode, vga_ts_read(vh, mode) & ~VGA_TS_MODE_BLANK);
+}
-void
+static void
 vga_raster_cursor_init(struct vgascreen *scr, int existing)
+{
 	struct vga_handle *vh = scr->hdl;
 	bus_space_tag_t memt;
 	bus_space_handle_t memh;
 	int off;
 	if (existing) {
 		/*
 		 * This is the first screen. At this point, scr->active is
 		 * false, so we can't use vga_raster_cursor() to do this.
 		 */
 		memt = vh->vh_memt;
 @@ -1048,27 +1048,27 @@ vga_raster_cursor_init(struct vgascreen
 		scr->cursortmp = scr->mem[off];
 		vga_raster_putchar(scr, scr->cursorrow, scr->cursorcol,
 		    scr->cursortmp.ch, scr->cursortmp.attr ^ 0x77);
 	} else {
 		scr->cursortmp.ch = 0;
 		scr->cursortmp.attr = 0;
 		scr->cursortmp.second = 0;
 		scr->cursortmp.enc = scr->encoding;
+	}
 	scr->cursoron = 1;
+}
-void
+static void
 vga_raster_cursor(void *id, int on, int row, int col)
+{
 	struct vgascreen *scr = id;
 	int off, tmp;
 	/* Remove old cursor image */
 	if (scr->cursoron) {
 		off = scr->cursorrow * scr->type->ncols + scr->cursorcol;
 		if (scr->active) {
 			tmp = scr->encoding;
 			scr->encoding = scr->cursortmp.enc;
 			if (scr->cursortmp.second)
 				vga_raster_putchar(id, scr->cursorrow,
 @@ -1108,27 +1108,27 @@ vga_raster_cursor(void *id, int on, int
 static int
 vga_raster_mapchar(void *id, int uni, u_int *index)
+{
 	struct vgascreen *scr = id;
 	if (scr->encoding == WSDISPLAY_FONTENC_IBM)
 		return pcdisplay_mapchar(id, uni, index);
 	else {
 		*index = uni;
 		return 5;
+	}
+}
-void
+static void
 vga_raster_putchar(void *id, int row, int col, u_int c, long attr)
+{
 	struct vgascreen *scr = id;
 	size_t off;
 	struct vga_raster_font *fs;
 	u_int tmp_ch;
 	off = row * scr->type->ncols + col;
 	if (__predict_false(off >= (scr->type->ncols * scr->type->nrows)))
 		return;
 	LIST_FOREACH(fs, &scr->fontset, next) {
 @@ -1241,27 +1241,27 @@ _vga_raster_putchar(void *id, int row, i
 			pattern = ((u_int8_t *)fs->font->data)
 			    [(c * fheight + i) * 2 + 1];
 			if (pattern != 0) {
 				rasoff2++;
 				dummy = bus_space_read_1(memt, memh, rasoff2);
 				bus_space_write_1(memt, memh, rasoff2, pattern);
 				rasoff2--;
+			}
 			rasoff2 += scr->type->ncols;
+		}
+	}
+}
-void
+static void
 vga_raster_copycols(void *id, int row, int srccol, int dstcol, int ncols)
+{
 	struct vgascreen *scr = id;
 	struct vga_handle *vh = scr->hdl;
 	bus_space_tag_t memt = vh->vh_memt;
 	bus_space_handle_t memh = vh->vh_memh;
 	bus_size_t srcoff, dstoff;
 	bus_size_t rassrcoff, rasdstoff;
 	int i;
 	int fheight = scr->type->fontheight;
 	srcoff = row * scr->type->ncols + srccol;
 	dstoff = row * scr->type->ncols + dstcol;
 @@ -1271,40 +1271,40 @@ vga_raster_copycols(void *id, int row, i
 	memcpy(&scr->mem[dstoff], &scr->mem[srcoff],
 	    ncols * sizeof(struct vga_scrmem));
 	vga_gdc_write(vh, mode, 0x01);
 	if (scr->active) {
 		for (i = 0; i < fheight; i++) {
 			bus_space_copy_region_1(memt, memh,
 			    rassrcoff + i * scr->type->ncols, memh,
 			    rasdstoff + i * scr->type->ncols, ncols);
+		}
+	}
+}
-void
+static void
 vga_raster_erasecols(void *id, int row, int startcol, int ncols, long fillattr)
+{
 	struct vgascreen *scr = id;
 	int i;
 	if (scr->active == 0)
 		return;
 	for (i = startcol; i < startcol + ncols; i++)
 		vga_raster_putchar(id, row, i, ' ', fillattr);
+}
-void
+static void
 vga_raster_copyrows(void *id, int srcrow, int dstrow, int nrows)
+{
 	struct vgascreen *scr = id;
 	struct vga_handle *vh = scr->hdl;
 	bus_space_tag_t memt = vh->vh_memt;
 	bus_space_handle_t memh = vh->vh_memh;
 	int ncols;
 	bus_size_t srcoff, dstoff;
 	bus_size_t rassrcoff, rasdstoff;
 	int fheight;
 	ncols = scr->type->ncols;
 	fheight = scr->type->fontheight;
 @@ -1342,27 +1342,27 @@ vga_raster_copyrows(void *id, int srcrow
 				/* Enable cursor. */
 				vga_raster_cursor(scr, 1, scr->cursorrow,
 				    scr->cursorcol);
 		} else
 			bus_space_copy_region_1(memt, memh,
 			    scr->dispoffset + rassrcoff, memh,
 			    scr->dispoffset + rasdstoff,
 			    nrows * ncols * fheight);
+	}
 	memcpy(&scr->mem[dstoff], &scr->mem[srcoff],
 	    nrows * ncols * sizeof(struct vga_scrmem));
+}
-void
+static void
 vga_raster_eraserows(void *id, int startrow, int nrows, long fillattr)
+{
 	struct vgascreen *scr = id;
 	struct vga_handle *vh = scr->hdl;
 	bus_space_tag_t memt = vh->vh_memt;
 	bus_space_handle_t memh = vh->vh_memh;
 	bus_size_t off, count;
 	bus_size_t rasoff, rascount;
 	int i;
 	off = startrow * scr->type->ncols;
 	count = nrows * scr->type->ncols;
 	rasoff = off * scr->type->fontheight;
 @@ -1421,59 +1421,59 @@ vga_raster_allocattr(void *id, int fg, i
 			return (EINVAL);
 		if (flags & WSATTR_WSCOLORS)
 			*attrp = fgansitopc[fg] | bgansitopc[bg];
 		else
 			*attrp = 7;
 		if (flags & WSATTR_HILIT)
 			*attrp += 8;
+	}
 	if (flags & WSATTR_BLINK)
 		*attrp |= FG_BLINK;
 	return (0);
+}
-void
+static void
 vga_restore_screen(struct vgascreen *scr,
     const struct wsscreen_descr *type, struct vga_scrmem *mem)
+{
 	int i, j, off, tmp;
 	tmp = scr->encoding;
 	for (i = 0; i < type->nrows; i++) {
 		for (j = 0; j < type->ncols; j++) {
 			off = i * type->ncols + j;
 			if (mem[off].second != 1) {
 				scr->encoding = mem[off].enc;
 				vga_raster_putchar(scr, i, j, mem[off].ch,
 				    mem[off].attr);
+			}
+		}
+	}
 	scr->encoding = tmp;
+}
-void
+static void
 vga_raster_setscreentype(struct vga_config *vc,
     const struct wsscreen_descr *type)
+{
 	struct vga_handle *vh = &vc->hdl;
 	struct vga_moderegs moderegs;
 	vga_setup_regs((struct videomode *)type->modecookie, &moderegs);
 	vga_set_mode(vh, &moderegs);
+}
 #ifdef WSDISPLAY_CUSTOM_OUTPUT
-void
+static void
 vga_raster_replaceattr(void *id, long oldattr, long newattr)
+{
 	struct vgascreen *scr = id;
 	const struct wsscreen_descr *type = scr->type;
 	int off;
 	for (off = 0; off < type->nrows * type->ncols; off++) {
 		if (scr->mem[off].attr == oldattr)
 			scr->mem[off].attr = newattr;
+	}
 	/* Repaint the whole screen, if needed */
 	if (scr->active)

 @@ -1,14 +1,14 @@
-/* $NetBSD: vgavar.h,v 1.29 2010/12/09 23:33:30 christos Exp $ */
+/* $NetBSD: vgavar.h,v 1.30 2013/01/21 19:49:15 mlelstv 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.
+ *
 @@ -207,17 +207,15 @@ void	vga_resume(struct vga_softc *);
 struct wsscreen_descr;
 void 	vga_loadchars(struct vga_handle *, int, int, int, int, const char *);
 void 	vga_readoutchars(struct vga_handle *, int, int, int, int, char *);
 #ifdef VGA_CONSOLE_ATI_BROKEN_FONTSEL
 void 	vga_copyfont01(struct vga_handle *);
 #endif
 void 	vga_setfontset(struct vga_handle *, int, int);
 void 	vga_setscreentype(struct vga_handle *, const struct wsscreen_descr *);
 #else /* !VGA_RASTERCONSOLE */
 void 	vga_load_builtinfont(struct vga_handle *, u_int8_t *, int, int);
 #endif /* !VGA_RASTERCONSOLE */
 void	vga_reset(struct vga_handle *, void (*)(struct vga_handle *));
 void	vga_initregs(struct vga_handle *);
 void	vga_save_palette(struct vga_config *);
 void	vga_restore_palette(struct vga_config *);
 extern int vga_no_builtinfont;