 @@ -1,14 +1,14 @@
-/*	$NetBSD: grf.c,v 1.62 2014/07/25 08:10:31 dholland Exp $ */
+/*	$NetBSD: grf.c,v 1.63 2015/11/07 14:29:10 phx Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
+ *
  * from: Utah $Hdr: grf.c 1.31 91/01/21$
+ *
  *	@(#)grf.c	7.8 (Berkeley) 5/7/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.62 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.63 2015/11/07 14:29:10 phx Exp $");
 /*
  * Graphics display driver for the Amiga
  * This is the hardware-independent portion of the driver.
  * Hardware access is through the grf_softc->g_mode routine.
  */
 #include "view.h"
 #include "grf.h"
 #include "kbd.h"
 #include "wsdisplay.h"
 #include <sys/param.h>
 @@ -66,27 +66,26 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.62
 #include <machine/cpu.h>
 #include <dev/cons.h>
 #include <dev/sun/fbio.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #include <amiga/amiga/color.h>	/* DEBUG */
 #include <amiga/amiga/device.h>
 #include <amiga/dev/grfioctl.h>
 #include <amiga/dev/grfws.h>
 #include <amiga/dev/grfvar.h>
 #include <amiga/dev/itevar.h>
 #include <amiga/dev/kbdvar.h>
 #include <amiga/dev/viewioctl.h>
 #include <sys/conf.h>
 #if NGRF > 0
 #include "ite.h"
 #if NITE == 0
 #define	ite_on(u,f)
 #define	ite_off(u,f)
 #define ite_reinit(d)
 @@ -172,55 +171,57 @@ grfattach(device_t parent, device_t self
+{
 #if NWSDISPLAY > 0
 	struct wsemuldisplaydev_attach_args wa;
 	long defattr;
 #endif
 	struct grf_softc *gp;
 	int maj;
 	gp = device_private(parent);
 	gp->g_device = self;
 	grfsp[gp->g_unit] = gp;
 	/*
-	 * find our major device number
+	 * find our major device number, make device
 	 */
 	maj = cdevsw_lookup_major(&grf_cdevsw);
 	gp->g_grfdev = makedev(maj, gp->g_unit);
 	if (self != NULL) {
 		printf(": width %d height %d", gp->g_display.gd_dwidth,
 		    gp->g_display.gd_dheight);
 		if (gp->g_display.gd_colors == 2)
 			printf(" monochrome\n");
 		else
 			printf(" colors %d\n", gp->g_display.gd_colors);
 #if NWSDISPLAY > 0
-		vcons_init(&gp->g_vd, gp, gp->g_screens[0], gp->g_accessops);
+		vcons_init(&gp->g_vd, gp, gp->g_defaultscr, gp->g_accessops);
 		gp->g_vd.init_screen = grf_init_screen;
 		if (gp->g_flags & GF_CONSOLE) {
 			console_vcons.scr_flags |= VCONS_SCREEN_IS_STATIC;
 			vcons_init_screen(&gp->g_vd,
 			    &console_vcons, 1, &defattr);
-			gp->g_screens[0]->textops =
+			gp->g_defaultscr->textops =
 			    &console_vcons.scr_ri.ri_ops;
-			wsdisplay_cnattach(gp->g_screens[0],
+			wsdisplay_cnattach(gp->g_defaultscr,
 			    &console_vcons.scr_ri, 0, 0, defattr);
 			vcons_replay_msgbuf(&console_vcons);
+		}
 		/* attach wsdisplay */
 		wa.console = (gp->g_flags & GF_CONSOLE) != 0;
-		wa.scrdata = &gp->g_screenlist;
+		wa.scrdata = gp->g_scrlist;
 		wa.accessops = gp->g_accessops;
 		wa.accesscookie = &gp->g_vd;
 		config_found(self, &wa, wsemuldisplaydevprint);
 #endif  /* NWSDISPLAY > 0 */
+	}
 #if NWSDISPLAY == 0
 	/*
 	 * try and attach an ite
 	 */
 	amiga_config_found(cfdata, self, gp, grfprint);
 #endif
+}
 @@ -467,36 +468,37 @@ grfcnprobe(struct consdev *cd)
 void
 grfcninit(struct consdev *cd)
+{
 	struct grf_softc *gp;
 	struct rasops_info *ri;
 	long defattr;
 	int unit;
 	/* find console grf and set up wsdisplay for it */
 	for (unit = 1; unit < NGRF; unit++) {
 		gp = grfsp[unit];
 		if (gp != NULL && (gp->g_flags & GF_ALIVE)) {
 			gp->g_flags |= GF_CONSOLE;  /* we are console! */
 			gp->g_screens[0]->ncols = gp->g_display.gd_fbwidth /
-			    gp->g_screens[0]->fontwidth;
+			gp->g_defaultscr->ncols = gp->g_display.gd_fbwidth /
-			gp->g_screens[0]->nrows = gp->g_display.gd_fbheight /
+			    gp->g_defaultscr->fontwidth;
-			    gp->g_screens[0]->fontheight;
+			gp->g_defaultscr->nrows = gp->g_display.gd_fbheight /
 			    gp->g_defaultscr->fontheight;
 			ri = grf_setup_rasops(gp, &console_vcons);
 			console_vcons.scr_cookie = gp;
 			defattr = 0;  /* XXX */
-			wsdisplay_preattach(gp->g_screens[0], ri, 0, 0,
+			wsdisplay_preattach(gp->g_defaultscr, ri, 0, 0,
 			    defattr);
 #if NKBD > 0
 			/* tell kbd device it is used as console keyboard */
 			kbd_cnattach();
 #endif
 			return;
+		}
+	}
 	panic("grfcninit: lost console");
+}
 static void
 grf_init_screen(void *cookie, struct vcons_screen *scr, int existing,
 @@ -509,45 +511,105 @@ grf_init_screen(void *cookie, struct vco
 	ri = grf_setup_rasops(gp, scr);
+}
 static struct rasops_info *
 grf_setup_rasops(struct grf_softc *gp, struct vcons_screen *scr)
+{
 	struct rasops_info *ri;
 	int i;
 	ri = &scr->scr_ri;
 	scr->scr_flags |= VCONS_DONT_READ;
 	memset(ri, 0, sizeof(struct rasops_info));
-	ri->ri_rows = gp->g_screens[0]->nrows;
+	ri->ri_rows = gp->g_defaultscr->nrows;
-	ri->ri_cols = gp->g_screens[0]->ncols;
+	ri->ri_cols = gp->g_defaultscr->ncols;
 	ri->ri_hw = scr;
 	ri->ri_ops.cursor    = gp->g_emulops->cursor;
 	ri->ri_ops.mapchar   = gp->g_emulops->mapchar;
 	ri->ri_ops.copyrows  = gp->g_emulops->copyrows;
 	ri->ri_ops.eraserows = gp->g_emulops->eraserows;
 	ri->ri_ops.copycols  = gp->g_emulops->copycols;
 	ri->ri_ops.erasecols = gp->g_emulops->erasecols;
 	ri->ri_ops.putchar   = gp->g_emulops->putchar;
 	ri->ri_ops.allocattr = gp->g_emulops->allocattr;
 	/* multiplication table for row-offsets */
 	for (i = 0; i < ri->ri_rows; i++)
 		gp->g_rowoffset[i] = i * ri->ri_cols;
 	return ri;
+}
 /*
  * Called as fallback for ioctls which are not handled by the specific
  * grf driver.
  */
 int
 grf_wsioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
+{
 	struct wsdisplayio_fbinfo *iofbi;
 	struct wsdisplay_fbinfo *fbinfo;
 	struct vcons_data *vd;
 	struct grf_softc *gp;
 	struct vcons_screen *scr;
 	struct grfinfo *gi;
 	vd = v;
 	gp = vd->cookie;
 	scr = vd->active;
 	switch (cmd) {
 	case WSDISPLAYIO_GET_FBINFO:
 		if (scr != NULL) {
 			iofbi = data;
 			return wsdisplayio_get_fbinfo(&scr->scr_ri, iofbi);
+		}
 		return ENODEV;
 	case WSDISPLAYIO_GINFO:
 		if (scr != NULL) {
 			fbinfo = (struct wsdisplay_fbinfo *)data;
 			gi = &gp->g_display;
 			/*
 			 * We should return truth about the current mode here,
 			 * because X11 wsfb driver depends on this!
 			 */
 			fbinfo->height = gi->gd_fbheight;
 			fbinfo->width = gi->gd_fbwidth;
 			fbinfo->depth = gi->gd_planes;
 			fbinfo->cmsize = gi->gd_colors;
 			return 0;
+		}
 		return ENODEV;
 	case WSDISPLAYIO_GTYPE:
 		*(u_int *)data = WSDISPLAY_TYPE_GRF;
 		return 0;
 	case WSDISPLAYIO_SMODE:
 		if ((*(int *)data) != gp->g_wsmode) {
 			gp->g_wsmode = *(int *)data;
 			if (gp->g_wsmode == WSDISPLAYIO_MODE_EMUL &&
 			    scr != NULL)
 				vcons_redraw_screen(scr);
+		}
 		return 0;
+	}
 	return EPASSTHROUGH;
+}
 paddr_t
 grf_wsmmap(void *v, void *vs, off_t off, int prot)
+{
 	struct vcons_data *vd;
 	struct grf_softc *gp;
 	struct grfinfo *gi;
 	vd = v;
 	gp = vd->cookie;
 	gi = &gp->g_display;
 	/* Normal fb mapping */
 	if (off < gi->gd_fbsize)
 @@ -572,246 +634,16 @@ grf_wsmmap(void *v, void *vs, off_t off,
 	return -1;
+}
 static paddr_t
 grf_wsmmap_md(off_t off)
+{
 #if defined(__m68k__)
 	return (paddr_t) m68k_btop(off);
 #else
 	return -1; /* FIXME */
 #endif
+}
 int
 grf_wsioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
 	struct vcons_data *vd;
 	struct grf_softc *gp;
 	vd = v;
 	gp = vd->cookie;
 	switch (cmd) {
 	/* XXX: check if ptr to implementation is not null */
 	case WSDISPLAYIO_GINFO:
 		return gp->g_wsioctl->ginfo(gp, data);
 	case WSDISPLAYIO_SMODE:
 		return gp->g_wsioctl->smode(gp, data);
 	case WSDISPLAYIO_GMODE:
 		return gp->g_wsioctl->gmode(gp, data);
 	case WSDISPLAYIO_GTYPE:
 		return gp->g_wsioctl->gtype(gp, data);
 	case WSDISPLAYIO_SVIDEO:
 		return gp->g_wsioctl->svideo(gp, data);
 	case WSDISPLAYIO_GVIDEO:
 		return gp->g_wsioctl->gvideo(gp, data);
 	case WSDISPLAYIO_GETCMAP:
 		return gp->g_wsioctl->getcmap(gp, data);
 	case WSDISPLAYIO_PUTCMAP:
 		return gp->g_wsioctl->putcmap(gp, data);
 	return EPASSTHROUGH;
 /* wsdisplay_accessops ioctls */
 int
 grf_wsaogetcmap(void *c, void *data)
 	u_int index, count;
 	struct grf_softc *gp;
 	struct wsdisplay_cmap *cm __unused;
 	cm = (struct wsdisplay_cmap*) data;
 	gp = c;
 	index = 0;
 	count = 0;
 	if (gp->g_wsmode == WSDISPLAYIO_MODE_EMUL)
 		return EINVAL;
 	if (index >= 255 || count > 256 || index + count > 256)
 		return EINVAL;
 	/*
 	 * TODO: copyout values for r, g, b. This function should be
 	 * driver-specific...
 	 */
 	return 0;
 int
 grf_wsaoputcmap(void *c, void *data)
 	/*
 	 * We probably couldn't care less about color map in MODE_EMUL,
 	 * I don't know about X11 yet. Also, these ioctls could be used by
 	 * fullscreen console programs (think wsdisplay picture viewer, or
 	 * the wsimgshow tool written by Yasushi Oshima).
 	 */
 	struct grf_softc *gp;
 	gp = c;
 	if (gp->g_wsmode == WSDISPLAYIO_MODE_EMUL)
 		return EINVAL;
 	/* ... */
 	return 0;
 int
 grf_wsaosvideo(void *c, void *data)
 #if 0
 	struct grf_softc *gp;
 	dev_t dev;
 	int rv;
 	gp = c;
 	dev = (dev_t) &gp->g_grfdev;
 	if (*(u_int *)data == WSDISPLAYIO_VIDEO_OFF) {
 		if ((gp->g_flags & GF_GRFON) == 0)
 			rv = 0;
 		else {
 			gp->g_flags &= ~GF_GRFON;
 			rv = gp->g_mode(gp, (dev & GRFOVDEV) ?
 			    GM_GRFOVOFF : GM_GRFOFF, NULL, 0, 0);
 	} else {
 		if ((gp->g_flags & GF_GRFON))
         		rv = 0;
 		else
 			gp->g_flags |= GF_GRFON;
 			rv = gp->g_mode(gp, (dev & GRFOVDEV) ?
 			    GM_GRFOVON : GM_GRFON, NULL, 0, 0);
 	return rv;
 #endif
 	return 0;
 int
 grf_wsaogvideo(void *c, void *data)
 	struct grf_softc *gp;
 	gp = c;
 	if(gp->g_flags & GF_GRFON)
 		*(u_int *)data = WSDISPLAYIO_VIDEO_ON;
 	else
 		*(u_int *)data = WSDISPLAYIO_VIDEO_OFF;
 	return 0;
 int
 grf_wsaogtype(void *c, void *data)
 	struct grf_softc *gp __unused;
 	gp = c;
 	*(u_int *)data = WSDISPLAY_TYPE_GRF;
 	return 0;
 int
 grf_wsaogmode(void *c, void *data)
 	struct grf_softc *gp;
 	gp = c;
 	*(u_int *)data = gp->g_wsmode;
 	return 0;
 int
 grf_wsaosmode(void *c, void *data)
 	/* XXX: should provide hw-dependent impl of this in grf_xxx driver? */
 	struct grf_softc *gp;
 	gp = c;
 	if ((*(int*) data) != gp->g_wsmode) {
 		gp->g_wsmode = (*(int*) data);
 		if ((*(int*) data) == WSDISPLAYIO_MODE_EMUL) {
 			//vcons_redraw_screen( active vcons screen );
 	return 0;
 int
 grf_wsaoginfo(void *c, void *data)
 	struct wsdisplay_fbinfo *fbinfo;
 	struct grf_softc *gp;
 	struct grfinfo *gi;
 	gp = c;
 	fbinfo = (struct wsdisplay_fbinfo *)data;
 	gi = &gp->g_display;
 	/*
 	 * TODO: better sanity checking, it is possible that
 	 * wsdisplay is initialized, but no screen is opened
 	 * (for example, device is not used).
 	 */
 	/*
 	 * We shold return truth about current mode here because
 	 * X11 wsfb driver denepds on this!
 	 */
 	fbinfo->height = gi->gd_fbheight;
 	fbinfo->width = gi->gd_fbwidth;
 	fbinfo->depth = gi->gd_planes;
 	fbinfo->cmsize = gi->gd_colors;
 	return 0;
 #endif  /* NWSDISPLAY > 0 */
 #ifdef DEBUG
 void
 grfdebug(struct grf_softc *gp, const char *fmt, ...)
 	static int ccol = 0, crow = 1;
 	volatile char *cp;
 	char buf[256];
 	va_list ap;
 	int ncols;
 	char *bp;
 	va_start(ap, fmt);
 	vsnprintf(buf, 256, fmt, ap);
 	va_end(ap);
 	cp = gp->g_fbkva;
 	ncols = gp->g_display.gd_fbwidth / 8;
 	cp += (crow * ncols + ccol) << 2;
 	for (bp = buf; *bp != '\0'; bp++) {
 		if (*bp == '\n') {
 			ccol = 0;
 			crow++;
 			continue;
 		*cp++ = *bp;
 		*cp = 0x0a;
 		cp += 3;
 		ccol++;
 #endif  /* DEBUG */
 #endif	/* NGRF > 0 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: grf_cv.c,v 1.56 2014/01/22 00:25:16 christos Exp $ */
+/*	$NetBSD: grf_cv.c,v 1.57 2015/11/07 14:29:10 phx Exp $ */
 /*
  * Copyright (c) 1995 Michael Teske
  * 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.
 @@ -23,27 +23,27 @@
  * 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 AUTHOR 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 "opt_amigacons.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.56 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.57 2015/11/07 14:29:10 phx Exp $");
 #include "grfcv.h"
 #include "ite.h"
 #include "wsdisplay.h"
 #if NGRFCV > 0
 /*
  * Graphics routines for the CyberVision 64 board, using the S3 Trio64.
+ *
  * Modified for CV64 from
  * Kari Mettinen's Cirrus driver by Michael Teske 10/95
+ *
  * Thanks to Tekelec Airtronic for providing me with a S3 Trio64 documentation.
 @@ -65,42 +65,42 @@ __KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1
 #include <dev/cons.h>
 #if NWSDISPLAY > 0
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #endif
 #include <amiga/dev/itevar.h>
 #include <amiga/amiga/device.h>
 #include <amiga/amiga/isr.h>
 #include <amiga/dev/grfioctl.h>
 #include <amiga/dev/grfws.h>
 #include <amiga/dev/grfvar.h>
 #include <amiga/dev/grf_cvreg.h>
 #include <amiga/dev/zbusvar.h>
 int	grfcvmatch(device_t, cfdata_t, void *);
 void	grfcvattach(device_t, device_t, void *);
 int	grfcvprint(void *, const char *);
 int	cvintr(void *);
 static int cv_has_4mb(volatile void *);
 static unsigned short cv_compute_clock(unsigned long);
 void	cv_boardinit(struct grf_softc *);
 int	cv_getvmode(struct grf_softc *, struct grfvideo_mode *);
 int	cv_setvmode(struct grf_softc *, unsigned int);
-int	cv_blank(struct grf_softc *, int *);
+int	cv_blank(struct grf_softc *, int);
 int	cv_isblank(struct grf_softc *);
 int	cv_mode(register struct grf_softc *, u_long, void *, u_long, int);
 int	cv_ioctl(register struct grf_softc *gp, u_long cmd, void *data);
 int	cv_setmonitor(struct grf_softc *, struct grfvideo_mode *);
 int	cv_getcmap(struct grf_softc *, struct grf_colormap *);
 int	cv_putcmap(struct grf_softc *, struct grf_colormap *);
 int	cv_toggle(struct grf_softc *);
 int	cv_mondefok(struct grfvideo_mode *);
 int	cv_load_mon(struct grf_softc *, struct grfcvtext_mode *);
 void	cv_inittextmode(struct grf_softc *);
 static	inline void cv_write_port(unsigned short, volatile void *);
 static	inline void cvscreen(int, volatile void *);
 static	inline void gfx_on_off(int, volatile void *);
 @@ -260,70 +260,69 @@ static int cv_fbsize;
  * if you set this flag. Again: This flag may destroy your CV Board.
  * Use it at your own risk!!!
  * Anyway, this doesn't imply that I'm responsible if your board breaks
  * without setting this flag :-).
  */
 #ifdef CV_AGGRESSIVE_TIMING
 long cv_memclk = 55000000;
 #else
 long cv_memclk = 50000000;
 #endif
 #if NWSDISPLAY > 0
 /* wsdisplay acessops, emulops */
 static int	cv_wsioctl(void *, void *, u_long, void *, int, struct lwp *);
 static void	cv_wscursor(void *, int, int, int);
 static void	cv_wsputchar(void *, int, int, u_int, long);
 static void	cv_wscopycols(void *, int, int, int, int);
 static void	cv_wserasecols(void *, int, int, int, long);
 static void	cv_wscopyrows(void *, int, int, int);
 static void	cv_wseraserows(void *, int, int, long);
 static int	cv_wsallocattr(void *, int, int, int, long *);
 static int	cv_wsmapchar(void *, int, unsigned int *);
 static struct wsdisplay_accessops cv_accessops = {
-	.ioctl		= grf_wsioctl,
+	.ioctl		= cv_wsioctl,
 	.mmap		= grf_wsmmap
 };
 static struct wsdisplay_emulops cv_textops = {
 	.cursor		= cv_wscursor,
 	.mapchar	= cv_wsmapchar,
 	.putchar	= cv_wsputchar,
 	.copycols	= cv_wscopycols,
 	.erasecols	= cv_wserasecols,
 	.copyrows	= cv_wscopyrows,
 	.eraserows	= cv_wseraserows,
 	.allocattr	= cv_wsallocattr
 };
-static struct ws_ao_ioctl cv_wsioctl = {
+static struct wsscreen_descr cv_defaultscreen = {
 	grf_wsaoginfo,
 	grf_wsaogetcmap,
 	grf_wsaoputcmap,
 	grf_wsaogvideo,
 	grf_wsaosvideo,
 	grf_wsaogmode,
 	grf_wsaosmode,
 	grf_wsaogtype
 };
 static struct wsscreen_descr cv_screen = {
 	.name		= "default",
 	.textops	= &cv_textops,
 	.fontwidth	= 8,
 	.fontheight	= S3FONTY,
 	.capabilities	= WSSCREEN_HILIT | WSSCREEN_BLINK |
 			  WSSCREEN_REVERSE | WSSCREEN_UNDERLINE
 };
 static const struct wsscreen_descr *cv_screens[] = {
 	&cv_defaultscreen,
 };
 static struct wsscreen_list cv_screenlist = {
 	sizeof(cv_screens) / sizeof(struct wsscreen_descr *), cv_screens
 };
 #endif  /* NWSDISPLAY > 0 */
 /* standard driver stuff */
 CFATTACH_DECL_NEW(grfcv, sizeof(struct grf_cv_softc),
     grfcvmatch, grfcvattach, NULL, NULL);
 static struct cfdata *cfdata;
 #define CV_INT_NUM 6	/* CV interrupt Level: #2 or #6 */
 #define CV_ULCURSOR 1	/* Underlined Cursor in textmode */
 #ifndef CV_NO_HARDWARE_CURSOR
 @@ -530,29 +529,28 @@ grfcvattach(device_t parent, device_t se
 		/* add Interrupt Handler */
 		gcp->gcs_isr.isr_ipl = CV_INT_NUM;
 		gcp->gcs_isr.isr_intr = cvintr;
 		gcp->gcs_isr.isr_arg = (void *)gp;
 		add_isr(&gcp->gcs_isr);
 		/* wakeup the board */
 		cv_boardinit(gp);
 #ifdef CV64CONSOLE
 #if NWSDISPLAY > 0
 		gp->g_accessops = &cv_accessops;
 		gp->g_emulops = &cv_textops;
-		gp->g_defaultscreen = cv_screen;
+		gp->g_defaultscr = &cv_defaultscreen;
-		gp->g_screens[0] = &gp->g_defaultscreen;
+		gp->g_scrlist = &cv_screenlist;
 		gp->g_wsioctl = &cv_wsioctl;
 #else
 		grfcv_iteinit(gp);
 #endif
 		(void)cv_load_mon(gp, &cvconsole_mode);
 #endif
+	}
 	/*
 	 * attach grf
 	 */
 	if (amiga_config_found(cfdata, gp->g_device, gp, grfcvprint)) {
 		if (self != NULL)
 			printf("grfcv: CyberVision64 with %dMB being used\n",
 @@ -936,36 +934,48 @@ cv_setvmode(struct grf_softc *gp, unsign
+{
 	if (!mode || (mode > monitor_def_max) ||
 	    monitor_def[mode - 1].mode_num == 0)
 		return (EINVAL);
 	monitor_current = monitor_def + (mode - 1);
 	return (0);
+}
 int
-cv_blank(struct grf_softc *gp, int *on)
+cv_blank(struct grf_softc *gp, int on)
+{
 	volatile void *ba;
 	ba = gp->g_regkva;
-	gfx_on_off(*on > 0 ? 0 : 1, ba);
+	gfx_on_off(on > 0 ? 0 : 1, ba);
 	return (0);
+}
 int
 cv_isblank(struct grf_softc *gp)
+{
 	volatile void *ba;
 	int r;
 	ba = gp->g_regkva;
 	r = RSeq(ba, SEQ_ID_CLOCKING_MODE);
 	return (r & 0x20) != 0;
+}
 /*
  * Change the mode of the display.
  * Return a UNIX error number or 0 for success.
  */
 int
 cv_mode(register struct grf_softc *gp, u_long cmd, void *arg, u_long a2,
         int a3)
+{
 	int error;
 	switch (cmd) {
 	    case GM_GRFON:
 		error = cv_load_mon (gp,
 @@ -1045,27 +1055,27 @@ cv_ioctl(register struct grf_softc *gp,
 	    case GRFIOCPUTCMAP:
 		return (cv_putcmap (gp, (struct grf_colormap *) data));
 	    case GRFIOCBITBLT:
 		break;
 	    case GRFTOGGLE:
 		return (cv_toggle (gp));
 	    case GRFIOCSETMON:
 		return (cv_setmonitor (gp, (struct grfvideo_mode *)data));
 	    case GRFIOCBLANK:
-		return (cv_blank (gp, (int *)data));
+		return (cv_blank (gp, *(int *)data));
+	}
 	return (EPASSTHROUGH);
+}
 int
 cv_setmonitor(struct grf_softc *gp, struct grfvideo_mode *gv)
+{
 	struct grfvideo_mode *md;
 	if (!cv_mondefok(gv))
 		return (EINVAL);
 @@ -2434,16 +2444,53 @@ cv_wsallocattr(void *c, int fg, int bg,
 /* our font does not support unicode extensions */
 static int
 cv_wsmapchar(void *c, int ch, unsigned int *cp)
+{
 	if (ch > 0 && ch < 256) {
 		*cp = ch;
 		return 5;
+	}
 	*cp = ' ';
 	return 0;
+}
 static int
 cv_wsioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
+{
 	struct vcons_data *vd;
 	struct grf_softc *gp;
 	vd = v;
 	gp = vd->cookie;
 	switch (cmd) {
 	case WSDISPLAYIO_GETCMAP:
 		/* Note: wsdisplay_cmap and grf_colormap have same format */
 		if (gp->g_display.gd_planes == 8)
 			return cv_getcmap(gp, (struct grf_colormap *)data);
 		return EINVAL;
 	case WSDISPLAYIO_PUTCMAP:
 		/* Note: wsdisplay_cmap and grf_colormap have same format */
 		if (gp->g_display.gd_planes == 8)
 			return cv_putcmap(gp, (struct grf_colormap *)data);
 		return EINVAL;
 	case WSDISPLAYIO_GVIDEO:
 		if (cv_isblank(gp))
 			*(u_int *)data = WSDISPLAYIO_VIDEO_OFF;
 		else
 			*(u_int *)data = WSDISPLAYIO_VIDEO_ON;
 		return 0;
 	case WSDISPLAYIO_SVIDEO:
 		return cv_blank(gp, *(u_int *)data == WSDISPLAYIO_VIDEO_OFF);
+	}
 	/* handle this command hw-independant in grf(4) */
 	return grf_wsioctl(v, vs, cmd, data, flag, l);
+}
 #endif  /* NWSDISPLAY > 0 */
 #endif  /* NGRFCV */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: grf_cv3d.c,v 1.30 2014/01/22 00:25:16 christos Exp $ */
+/*	$NetBSD: grf_cv3d.c,v 1.31 2015/11/07 14:29:10 phx Exp $ */
 /*
  * Copyright (c) 1995 Michael Teske
  * 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.
 @@ -23,27 +23,27 @@
  * 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 AUTHOR 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 "opt_amigacons.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.30 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.31 2015/11/07 14:29:10 phx Exp $");
 #include "ite.h"
 #include "wsdisplay.h"
 #include "grfcv3d.h"
 #if NGRFCV3D > 0
 /*
  * Graphics routines for the CyberVision 64/3D board, using the S3 ViRGE.
+ *
  * Modified for CV64/3D from Michael Teske's CV driver by Tobias Abt 10/97.
  * Bugfixes by Bernd Ernesti 10/97.
  * Many thanks to Richard Hartmann who gave us his board so we could make
  * driver.
 @@ -89,51 +89,51 @@ Note: IO Regbase is needed fo wakeup of
 #include <dev/cons.h>
 #if NWSDISPLAY > 0
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #endif
 #include <amiga/dev/itevar.h>
 #include <amiga/amiga/device.h>
 #include <amiga/dev/grfioctl.h>
 #include <amiga/dev/grfws.h>
 #include <amiga/dev/grfvar.h>
 #include <amiga/dev/grf_cv3dreg.h>
 #include <amiga/dev/zbusvar.h>
 /*
  * finish all bus operations, flush pipelines
  */
 #if defined(__m68k__)
 #define cpu_sync() __asm volatile ("nop")
 #elif defined(__powerpc__)
 #define cpu_sync() __asm volatile ("sync; isync")
 #endif
 int	grfcv3dmatch(device_t, cfdata_t, void *);
 void	grfcv3dattach(device_t, device_t, void *);
 int	grfcv3dprint(void *, const char *);
 static int cv3d_has_4mb(volatile void *);
 static unsigned short cv3d_compute_clock(unsigned long);
 void	cv3d_boardinit(struct grf_softc *);
 int	cv3d_getvmode(struct grf_softc *, struct grfvideo_mode *);
 int	cv3d_setvmode(struct grf_softc *, unsigned int);
-int	cv3d_blank(struct grf_softc *, int *);
+int	cv3d_blank(struct grf_softc *, int);
 int	cv3d_isblank(struct grf_softc *);
 int	cv3d_mode(register struct grf_softc *, u_long, void *, u_long, int);
 int	cv3d_ioctl(register struct grf_softc *gp, u_long cmd, void *data);
 int	cv3d_setmonitor(struct grf_softc *, struct grfvideo_mode *);
 int	cv3d_getcmap(struct grf_softc *, struct grf_colormap *);
 int	cv3d_putcmap(struct grf_softc *, struct grf_colormap *);
 int	cv3d_toggle(struct grf_softc *);
 int	cv3d_mondefok(struct grfvideo_mode *);
 int	cv3d_load_mon(struct grf_softc *, struct grfcv3dtext_mode *);
 void	cv3d_inittextmode(struct grf_softc *);
 static	inline void cv3dscreen(int, volatile void *);
 static	inline void cv3d_gfx_on_off(int, volatile void *);
 #ifdef CV3D_HARDWARE_CURSOR
 @@ -280,69 +280,68 @@ static int cv3d_fbsize;
 static volatile void *cv3d_memory_io_base;
 static volatile void *cv3d_register_base;
 static volatile void *cv3d_vcode_switch_base;
 static volatile void *cv3d_special_register_base;
 /*
  * Memory clock (binpatchable).
  */
 long cv3d_memclk = 55000000;
 #if NWSDISPLAY > 0
 /* wsdisplay accessops, emulops */
 static int	cv3d_wsioctl(void *, void *, u_long, void *, int, struct lwp *);
 static void	cv3d_wscursor(void *, int, int, int);
 static void	cv3d_wsputchar(void *, int, int, u_int, long);
 static void	cv3d_wscopycols(void *, int, int, int, int);
 static void	cv3d_wserasecols(void *, int, int, int, long);
 static void	cv3d_wscopyrows(void *, int, int, int);
 static void	cv3d_wseraserows(void *, int, int, long);
 static int	cv3d_wsallocattr(void *, int, int, int, long *);
 static int	cv3d_wsmapchar(void *, int, unsigned int *);
 struct wsdisplay_accessops cv3d_accessops = {
-	.ioctl		= grf_wsioctl,
+	.ioctl		= cv3d_wsioctl,
 	.mmap		= grf_wsmmap
 };
 static struct wsdisplay_emulops cv3d_textops = {
 	.cursor		= cv3d_wscursor,
 	.mapchar	= cv3d_wsmapchar,
 	.putchar	= cv3d_wsputchar,
 	.copycols	= cv3d_wscopycols,
 	.copyrows	= cv3d_wscopyrows,
 	.erasecols	= cv3d_wserasecols,
 	.eraserows	= cv3d_wseraserows,
 	.allocattr	= cv3d_wsallocattr
 };
-static struct ws_ao_ioctl cv3d_wsioctl = {
+static struct wsscreen_descr cv3d_defaultscreen = {
 	grf_wsaoginfo,
 	grf_wsaogetcmap,
 	grf_wsaoputcmap,
 	grf_wsaogvideo,
 	grf_wsaosvideo,
 	grf_wsaogmode,
 	grf_wsaosmode,
 	grf_wsaogtype
 };
 static struct wsscreen_descr cv3d_screen = {
 	.name		= "default",
 	.textops	= &cv3d_textops,
 	.fontwidth	= 8,
 	.fontheight	= S3FONTY,
-	.capabilities	= WSSCREEN_HILIT | WSSCREEN_REVERSE |
+	.capabilities	= WSSCREEN_HILIT | WSSCREEN_BLINK |
-			  WSSCREEN_BLINK | WSSCREEN_UNDERLINE
+			  WSSCREEN_REVERSE | WSSCREEN_UNDERLINE
 };
 static const struct wsscreen_descr *cv3d_screens[] = {
 	&cv3d_defaultscreen,
 };
 static struct wsscreen_list cv3d_screenlist = {
 	sizeof(cv3d_screens) / sizeof(struct wsscreen_descr *), cv3d_screens
 };
 #endif /* NWSDISPLAY > 0 */
 /* standard driver stuff */
 CFATTACH_DECL_NEW(grfcv3d, sizeof(struct grf_softc),
     grfcv3dmatch, grfcv3dattach, NULL, NULL);
 static struct cfdata *cfdata;
 #define CV3D_ULCURSOR	1	/* Underlined Cursor in textmode */
 /*
  * Get frambuffer memory size.
 @@ -477,32 +476,31 @@ grfcv3dattach(device_t parent, device_t
 		gp->g_regkva = (volatile void *)cv3d_register_base;
 		gp->g_unit = GRF_CV3D_UNIT;
 		gp->g_mode = cv3d_mode;
 #if NITE > 0
 		gp->g_conpri = grfcv3d_cnprobe();
 #endif
 		gp->g_flags = GF_ALIVE;
 		/* wakeup the board */
 		cv3d_boardinit(gp);
 #ifdef CV3DCONSOLE
 #if NWSDISPLAY > 0
 		gp->g_accessops = &cv3d_accessops;
 		gp->g_emulops = &cv3d_textops;
-		gp->g_defaultscreen = cv3d_screen;
+		gp->g_defaultscr = &cv3d_defaultscreen;
-		gp->g_screens[0] = &gp->g_defaultscreen;
+		gp->g_scrlist = &cv3d_screenlist;
 		gp->g_wsioctl = &cv3d_wsioctl;
 #else
 		grfcv3d_iteinit(gp);
 #endif /* NWSDISPLAY > 0 */
 		(void)cv3d_load_mon(gp, &cv3dconsole_mode);
 #endif
+	}
 	/*
 	 * attach grf
 	 */
 	if (amiga_config_found(cfdata, gp->g_device, gp, grfcv3dprint)) {
 		if (self != NULL)
 			printf("%s: CyberVision64/3D with %dMB being used\n",
 @@ -857,36 +855,48 @@ cv3d_setvmode(struct grf_softc *gp, unsi
+{
 	if (!mode || (mode > monitor_def_max) ||
 	    monitor_def[mode - 1].mode_num == 0)
 		return (EINVAL);
 	monitor_current = monitor_def + (mode - 1);
 	return (0);
+}
 int
-cv3d_blank(struct grf_softc *gp, int *on)
+cv3d_blank(struct grf_softc *gp, int on)
+{
 	volatile void *ba;
 	ba = gp->g_regkva;
-	cv3d_gfx_on_off(*on > 0 ? 0 : 1, ba);
+	cv3d_gfx_on_off(on > 0 ? 0 : 1, ba);
 	return (0);
+}
 int
 cv3d_isblank(struct grf_softc *gp)
+{
 	volatile void *ba;
 	int r;
 	ba = gp->g_regkva;
 	r = RSeq(ba, SEQ_ID_CLOCKING_MODE);
 	return (r & 0x20) != 0;
+}
 /*
  * Change the mode of the display.
  * Return a UNIX error number or 0 for success.
  */
 int
 cv3d_mode(register struct grf_softc *gp, u_long cmd, void *arg, u_long a2,
           int a3)
+{
 	int error;
 	switch (cmd) {
 	    case GM_GRFON:
 		error = cv3d_load_mon (gp,
 @@ -966,27 +976,27 @@ cv3d_ioctl(register struct grf_softc *gp
 	    case GRFIOCPUTCMAP:
 		return (cv3d_putcmap (gp, (struct grf_colormap *) data));
 	    case GRFIOCBITBLT:
 		break;
 	    case GRFTOGGLE:
 		return (cv3d_toggle (gp));
 	    case GRFIOCSETMON:
 		return (cv3d_setmonitor (gp, (struct grfvideo_mode *)data));
 	    case GRFIOCBLANK:
-		return (cv3d_blank (gp, (int *)data));
+		return (cv3d_blank (gp, *(int *)data));
+	}
 	return (EPASSTHROUGH);
+}
 int
 cv3d_setmonitor(struct grf_softc *gp, struct grfvideo_mode *gv)
+{
 	struct grfvideo_mode *md;
 	if (!cv3d_mondefok(gv))
 		return (EINVAL);
 @@ -2289,16 +2299,53 @@ cv3d_wsmapchar(void *c, int ch, unsigned
 static int
 cv3d_wsallocattr(void *c, int fg, int bg, int flg, long *attr)
+{
 	/* XXX color support? */
 	*attr = (flg & WSATTR_REVERSE) ? 0x70 : 0x07;
 	if (flg & WSATTR_UNDERLINE)	*attr = 0x01;
 	if (flg & WSATTR_HILIT)		*attr |= 0x08;
 	if (flg & WSATTR_BLINK)		*attr |= 0x80;
 	return 0;
+}
 static int
 cv3d_wsioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
+{
 	struct vcons_data *vd;
 	struct grf_softc *gp;
 	vd = v;
 	gp = vd->cookie;
 	switch (cmd) {
 	case WSDISPLAYIO_GETCMAP:
 		/* Note: wsdisplay_cmap and grf_colormap have same format */
 		if (gp->g_display.gd_planes == 8)
 			return cv3d_getcmap(gp, (struct grf_colormap *)data);
 		return EINVAL;
 	case WSDISPLAYIO_PUTCMAP:
 		/* Note: wsdisplay_cmap and grf_colormap have same format */
 		if (gp->g_display.gd_planes == 8)
 			return cv3d_putcmap(gp, (struct grf_colormap *)data);
 		return EINVAL;
 	case WSDISPLAYIO_GVIDEO:
 		if (cv3d_isblank(gp))
 			*(u_int *)data = WSDISPLAYIO_VIDEO_OFF;
 		else
 			*(u_int *)data = WSDISPLAYIO_VIDEO_ON;
 		return 0;
 	case WSDISPLAYIO_SVIDEO:
 		return cv3d_blank(gp, *(u_int *)data == WSDISPLAYIO_VIDEO_OFF);
+	}
 	/* handle this command hw-independant in grf(4) */
 	return grf_wsioctl(v, vs, cmd, data, flag, l);
+}
 #endif /* NWSDISPLAY > 0 */
 #endif  /* NGRFCV3D */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: grfvar.h,v 1.24 2012/10/27 17:17:29 chs Exp $	*/
+/*	$NetBSD: grfvar.h,v 1.25 2015/11/07 14:29:10 phx Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -56,44 +56,51 @@ struct	grf_softc {
 	volatile void	*g_regkva;	/* KVA of registers */
 	volatile void	*g_fbkva;	/* KVA of framebuffer */
 	int		g_flags;	/* software flags */
 	int		g_unit;		/* grf unit we want/have */
 	dev_t		g_itedev;	/* ite device number */
 	dev_t		g_grfdev;	/* grf device number */
 	void		*g_data;	/* device dependent data */
 	int		g_blank;	/* shadow copy of blank value */
 	int		(*g_mode)(struct grf_softc *, u_long, void *,
 				  u_long, int);
 #if NWSDISPLAY > 0
 	struct wsdisplay_accessops	*g_accessops;
 	struct wsdisplay_emulops	*g_emulops;
-	struct wsscreen_descr		g_defaultscreen;
+	struct wsscreen_descr		*g_defaultscr;
-	struct wsscreen_descr		*g_screens[1];
+	struct wsscreen_list		*g_scrlist;
 	struct wsscreen_list		g_screenlist;
 	struct vcons_data		g_vd;
 	struct ws_ao_ioctl		*g_wsioctl;
 	uint16_t g_rowoffset[MAXROWS];	/* speed up putchar-multiplication */
 	int	g_wsmode;		/* current wsdisplay mode */
 #else
 	int	g_conpri;		/* priority of ite as console */
 	void 	(*g_iteinit)(struct ite_softc *);
 	void 	(*g_itedeinit)(struct ite_softc *);
 	void 	(*g_iteclear)(struct ite_softc *, int, int, int, int);
 	void 	(*g_iteputc)(struct ite_softc *, int, int, int, int);
 	void 	(*g_itecursor)(struct ite_softc *, int);
 	void 	(*g_itescroll)(struct ite_softc *, int, int, int, int);
 #endif /* NWSDISPLAY */
 };
 #if NWSDISPLAY > 0
 /*
  * Generic wsdisplay access ops that can be used from all grf drivers.
  */
 paddr_t	grf_wsmmap(void *, void *, off_t, int);
 int	grf_wsioctl(void *, void *, u_long, void *, int, struct lwp *);
 #endif /* NWSDISPLAY */
 #endif /* _KERNEL */
 /* flags */
 #define	GF_ALIVE	0x01
 #define GF_OPEN		0x02
 #define GF_EXCLUDE	0x04
 #define GF_WANTED	0x08
 #define GF_GRFON	0x10
 #define GF_CONSOLE	0x20
 /* software ids defined in grfioctl.h */
 /* requests to mode routine (g_mode())*/