Add the TGA video driver. This is a great accomplishtment and will help

us a lot on older Alphas.
Andrew Gallatin, Thomas V. Crimi, and Peter Jeremy contributed to this
work along with the submitter.

Submitted by:	 Andrew M. Miklic <miklic@home.com>

1 files changed, 168 insertions, 716 deletions

diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index e14341f..86e2444 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -23,11 +23,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * Copyright (c) 2000 Andrew Miklic
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_syscons.h"
-#include "opt_vga.h"
+#include "opt_gfb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,666 +41,243 @@
 #include <machine/bus.h>
 
 #include <dev/fb/fbreg.h>
-#include <dev/fb/vgareg.h>
 #include <dev/syscons/syscons.h>
 
-#include <isa/isareg.h>
-
 #ifndef SC_RENDER_DEBUG
 #define SC_RENDER_DEBUG		0
 #endif
 
-static vr_clear_t		vga_txtclear;
-static vr_draw_border_t		vga_txtborder;
-static vr_draw_t		vga_txtdraw;
-static vr_set_cursor_t		vga_txtcursor_shape;
-static vr_draw_cursor_t		vga_txtcursor;
-static vr_blink_cursor_t	vga_txtblink;
+static vr_clear_t		gfb_clear;
+static vr_draw_border_t		gfb_border;
+static vr_draw_t		gfb_draw;
+static vr_set_cursor_t		gfb_cursor_shape;
+static vr_draw_cursor_t		gfb_cursor;
+static vr_blink_cursor_t	gfb_blink;
 #ifndef SC_NO_CUTPASTE
-static vr_draw_mouse_t		vga_txtmouse;
+static vr_draw_mouse_t		gfb_mouse;
 #else
-#define vga_txtmouse		(vr_draw_mouse_t *)vga_nop
-#endif
-
-#ifdef SC_PIXEL_MODE
-static vr_clear_t		vga_pxlclear;
-static vr_draw_border_t		vga_pxlborder;
-static vr_draw_t		vga_egadraw;
-static vr_draw_t		vga_vgadraw;
-static vr_set_cursor_t		vga_pxlcursor_shape;
-static vr_draw_cursor_t		vga_pxlcursor;
-static vr_blink_cursor_t	vga_pxlblink;
-#ifndef SC_NO_CUTPASTE
-static vr_draw_mouse_t		vga_pxlmouse;
-#else
-#define vga_pxlmouse		(vr_draw_mouse_t *)vga_nop
-#endif
-#endif /* SC_PIXEL_MODE */
-
-#ifndef SC_NO_MODE_CHANGE
-static vr_draw_border_t		vga_grborder;
+#define gfb_mouse		(vr_draw_mouse_t *)gfb_nop
 #endif
 
-static void			vga_nop(scr_stat *scp, ...);
-
-static sc_rndr_sw_t txtrndrsw = {
-	vga_txtclear,
-	vga_txtborder,
-	vga_txtdraw,	
-	vga_txtcursor_shape,
-	vga_txtcursor,
-	vga_txtblink,
-	(vr_set_mouse_t *)vga_nop,
-	vga_txtmouse,
+static void			gfb_nop(scr_stat *scp, ...);
+
+sc_rndr_sw_t txtrndrsw = {
+	gfb_clear,
+	gfb_border,
+	gfb_draw,	
+	gfb_cursor_shape,
+	gfb_cursor,
+	gfb_blink,
+	(vr_set_mouse_t *)gfb_nop,
+	gfb_mouse,
 };
-RENDERER(mda, 0, txtrndrsw, vga_set);
-RENDERER(cga, 0, txtrndrsw, vga_set);
-RENDERER(ega, 0, txtrndrsw, vga_set);
-RENDERER(vga, 0, txtrndrsw, vga_set);
 
 #ifdef SC_PIXEL_MODE
-static sc_rndr_sw_t egarndrsw = {
-	vga_pxlclear,
-	vga_pxlborder,
-	vga_egadraw,
-	vga_pxlcursor_shape,
-	vga_pxlcursor,
-	vga_pxlblink,
-	(vr_set_mouse_t *)vga_nop,
-	vga_pxlmouse,
+sc_rndr_sw_t gfbrndrsw = {
+	gfb_clear,
+	gfb_border,
+	gfb_draw,
+	gfb_cursor_shape,
+	gfb_cursor,
+	gfb_blink,
+	(vr_set_mouse_t *)gfb_nop,
+	gfb_mouse,
 };
-RENDERER(ega, PIXEL_MODE, egarndrsw, vga_set);
-
-static sc_rndr_sw_t vgarndrsw = {
-	vga_pxlclear,
-	vga_pxlborder,
-	vga_vgadraw,
-	vga_pxlcursor_shape,
-	vga_pxlcursor,
-	vga_pxlblink,
-	(vr_set_mouse_t *)vga_nop,
-	vga_pxlmouse,
-};
-RENDERER(vga, PIXEL_MODE, vgarndrsw, vga_set);
 #endif /* SC_PIXEL_MODE */
 
 #ifndef SC_NO_MODE_CHANGE
-static sc_rndr_sw_t grrndrsw = {
-	(vr_clear_t *)vga_nop,
-	vga_grborder,
-	(vr_draw_t *)vga_nop,
-	(vr_set_cursor_t *)vga_nop,
-	(vr_draw_cursor_t *)vga_nop,
-	(vr_blink_cursor_t *)vga_nop,
-	(vr_set_mouse_t *)vga_nop,
-	(vr_draw_mouse_t *)vga_nop,
+sc_rndr_sw_t grrndrsw = {
+	(vr_clear_t *)gfb_nop,
+	gfb_border,
+	(vr_draw_t *)gfb_nop,
+	(vr_set_cursor_t *)gfb_nop,
+	(vr_draw_cursor_t *)gfb_nop,
+	(vr_blink_cursor_t *)gfb_nop,
+	(vr_set_mouse_t *)gfb_nop,
+	(vr_draw_mouse_t *)gfb_nop,
 };
-RENDERER(cga, GRAPHICS_MODE, grrndrsw, vga_set);
-RENDERER(ega, GRAPHICS_MODE, grrndrsw, vga_set);
-RENDERER(vga, GRAPHICS_MODE, grrndrsw, vga_set);
 #endif /* SC_NO_MODE_CHANGE */
 
-RENDERER_MODULE(vga, vga_set);
-
 #ifndef SC_NO_CUTPASTE
-static u_short mouse_and_mask[16] = {
-	0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80,
-	0xfe00, 0x1e00, 0x1f00, 0x0f00, 0x0f00, 0x0000, 0x0000, 0x0000
-};
-static u_short mouse_or_mask[16] = {
-	0x0000, 0x4000, 0x6000, 0x7000, 0x7800, 0x7c00, 0x7e00, 0x6800,
-	0x0c00, 0x0c00, 0x0600, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000
+
+static u_char mouse_pointer[16] = {
+	0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x68,
+	0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00
 };
 #endif
 
 static void
-vga_nop(scr_stat *scp, ...)
+gfb_nop(scr_stat *scp, ...)
 {
 }
 
 /* text mode renderer */
 
 static void
-vga_txtclear(scr_stat *scp, int c, int attr)
+gfb_clear(scr_stat *scp, int c, int attr)
 {
-	sc_vtb_clear(&scp->scr, c, attr);
+	(*vidsw[scp->sc->adapter]->clear)(scp->sc->adp);
 }
 
 static void
-vga_txtborder(scr_stat *scp, int color)
+gfb_border(scr_stat *scp, int color)
 {
 	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
 }
 
 static void
-vga_txtdraw(scr_stat *scp, int from, int count, int flip)
+gfb_draw(scr_stat *scp, int from, int count, int flip)
 {
-	vm_offset_t p;
-	int c;
-	int a;
-
-	if (from + count > scp->xsize*scp->ysize)
-		count = scp->xsize*scp->ysize - from;
-
-	if (flip) {
-		for (p = sc_vtb_pointer(&scp->scr, from); count-- > 0; ++from) {
-			c = sc_vtb_getc(&scp->vtb, from);
-			a = sc_vtb_geta(&scp->vtb, from);
-			a = (a & 0x8800) | ((a & 0x7000) >> 4) 
-				| ((a & 0x0700) << 4);
-			p = sc_vtb_putchar(&scp->scr, p, c, a);
+	char c;
+	char a;
+	int i, n;
+	video_adapter_t *adp;
+
+	adp = scp->sc->adp;
+
+	/*
+	   Determine if we need to scroll based on the offset
+	   and the number of characters to be displayed...
+	 */
+	if (from + count > scp->xsize*scp->ysize) {
+
+		/*
+		   Calculate the number of characters past the end of the
+		   visible screen...
+		*/
+		count = (from + count) -
+		    (adp->va_info.vi_width * adp->va_info.vi_height);
+
+		/*
+		   Calculate the number of rows past the end of the visible
+		   screen...
+		*/
+		n = (count / adp->va_info.vi_width) + 1;
+
+		/* Scroll to make room for new text rows... */
+		(*vidsw[scp->sc->adapter]->copy)(adp, n, 0, n);
+#ifdef 0
+		(*vidsw[scp->sc->adapter]->clear)(adp, n);
+#endif
+
+		/* Display new text rows... */
+		(*vidsw[scp->sc->adapter]->puts)(adp, from,
+		    (u_int16_t *)sc_vtb_pointer(&scp->vtb, from), count);
+	}
+
+	/*
+	   We don't need to scroll, so we can just put the characters
+	   all-at-once...
+	*/
+	else {
+
+		/*
+		   Determine the method by which we are to display characters
+		   (are we going to print forwards or backwards?
+		   do we need to do a character-by-character copy, then?)...
+		*/
+		if (flip)
+			for (i = count; i-- > 0; ++from) {
+				c = sc_vtb_getc(&scp->vtb, from);
+				a = sc_vtb_geta(&scp->vtb, from) >> 8;
+				(*vidsw[scp->sc->adapter]->putc)(adp, from, c,
+				    a);
+			}
+		else {
+			(*vidsw[scp->sc->adapter]->puts)(adp, from,
+			    (u_int16_t *)sc_vtb_pointer(&scp->vtb, from),
+			    count);
 		}
-	} else {
-		sc_vtb_copy(&scp->vtb, from, &scp->scr, from, count);
 	}
 }
 
 static void 
-vga_txtcursor_shape(scr_stat *scp, int base, int height, int blink)
+gfb_cursor_shape(scr_stat *scp, int base, int height, int blink)
 {
 	if (base < 0 || base >= scp->font_size)
 		return;
 	/* the caller may set height <= 0 in order to disable the cursor */
 #if 0
-	scp->curs_attr.base = base;
-	scp->curs_attr.height = height;
+	scp->cursor_base = base;
+	scp->cursor_height = height;
 #endif
 	(*vidsw[scp->sc->adapter]->set_hw_cursor_shape)(scp->sc->adp,
-							base, height,
-							scp->font_size, blink);
+	    base, height, scp->font_size, blink);
 }
 
-static void
-draw_txtcharcursor(scr_stat *scp, int at, u_short c, u_short a, int flip)
-{
-	sc_softc_t *sc;
-
-	sc = scp->sc;
-	scp->cursor_saveunder_char = c;
-	scp->cursor_saveunder_attr = a;
-
-#ifndef SC_NO_FONT_LOADING
-	if (scp->curs_attr.flags & CONS_CHAR_CURSOR) {
-		unsigned char *font;
-		int h;
-		int i;
-
-		if (scp->font_size < 14) {
-			font = sc->font_8;
-			h = 8;
-		} else if (scp->font_size >= 16) {
-			font = sc->font_16;
-			h = 16;
-		} else {
-			font = sc->font_14;
-			h = 14;
-		}
-		if (scp->curs_attr.base >= h)
-			return;
-		if (flip)
-			a = (a & 0x8800)
-				| ((a & 0x7000) >> 4) | ((a & 0x0700) << 4);
-		bcopy(font + c*h, font + sc->cursor_char*h, h);
-		font = font + sc->cursor_char*h;
-		for (i = imax(h - scp->curs_attr.base - scp->curs_attr.height, 0);
-			i < h - scp->curs_attr.base; ++i) {
-			font[i] ^= 0xff;
-		}
-		/* XXX */
-		(*vidsw[sc->adapter]->load_font)(sc->adp, 0, h, font,
-						 sc->cursor_char, 1);
-		sc_vtb_putc(&scp->scr, at, sc->cursor_char, a);
-	} else
-#endif /* SC_NO_FONT_LOADING */
-	{
-		if ((a & 0x7000) == 0x7000) {
-			a &= 0x8f00;
-			if ((a & 0x0700) == 0)
-				a |= 0x0700;
-		} else {
-			a |= 0x7000;
-			if ((a & 0x0700) == 0x0700)
-				a &= 0xf000;
-		}
-		if (flip)
-			a = (a & 0x8800)
-				| ((a & 0x7000) >> 4) | ((a & 0x0700) << 4);
-		sc_vtb_putc(&scp->scr, at, c, a);
-	}
-}
+static int pxlblinkrate = 0;
 
+#ifdef 0
 static void
-vga_txtcursor(scr_stat *scp, int at, int blink, int on, int flip)
+gfb_cursor(scr_stat *scp, int at, int blink, int on, int flip)
 {
 	video_adapter_t *adp;
-	int cursor_attr;
 
-	if (scp->curs_attr.height <= 0)	/* the text cursor is disabled */
+	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
 		return;
 
 	adp = scp->sc->adp;
-	if (blink) {
+	if(blink) {
 		scp->status |= VR_CURSOR_BLINK;
 		if (on) {
 			scp->status |= VR_CURSOR_ON;
 			(*vidsw[adp->va_index]->set_hw_cursor)(adp,
-							       at%scp->xsize,
-							       at/scp->xsize); 
+			    at%scp->xsize,
+			    at/scp->xsize);
 		} else {
 			if (scp->status & VR_CURSOR_ON)
-				(*vidsw[adp->va_index]->set_hw_cursor)(adp,
-								       -1, -1);
+				(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1,
+				    -1);
 			scp->status &= ~VR_CURSOR_ON;
 		}
 	} else {
 		scp->status &= ~VR_CURSOR_BLINK;
-		if (on) {
+		if(on) {
 			scp->status |= VR_CURSOR_ON;
-			draw_txtcharcursor(scp, at,
-					   sc_vtb_getc(&scp->scr, at),
-					   sc_vtb_geta(&scp->scr, at),
-					   flip);
+			scp->cursor_saveunder_char = sc_vtb_getc(&scp->scr, at);
+			scp->cursor_saveunder_attr = sc_vtb_geta(&scp->scr, at);
+			(*vidsw[scp->sc->adapter]->putc)(scp->sc->adp, at,
+			    scp->cursor_saveunder_char,
+			    scp->cursor_saveunder_attr);
 		} else {
-			cursor_attr = scp->cursor_saveunder_attr;
-			if (flip)
-				cursor_attr = (cursor_attr & 0x8800)
-					| ((cursor_attr & 0x7000) >> 4)
-					| ((cursor_attr & 0x0700) << 4);
 			if (scp->status & VR_CURSOR_ON)
-				sc_vtb_putc(&scp->scr, at,
-					    scp->cursor_saveunder_char,
-					    cursor_attr);
+				(*vidsw[scp->sc->adapter]->putc)(scp->sc->adp,
+				    at, scp->cursor_saveunder_char,
+				    scp->cursor_saveunder_attr);
 			scp->status &= ~VR_CURSOR_ON;
 		}
 	}
 }
-
-static void
-vga_txtblink(scr_stat *scp, int at, int flip)
-{
-}
-
-#ifndef SC_NO_CUTPASTE
-
-static void
-draw_txtmouse(scr_stat *scp, int x, int y)
-{
-#ifndef SC_ALT_MOUSE_IMAGE
-    if (ISMOUSEAVAIL(scp->sc->adp->va_flags)) {
-	u_char font_buf[128];
-	u_short cursor[32];
-	u_char c;
-	int pos;
-	int xoffset, yoffset;
-	int crtc_addr;
-	int i;
-
-	/* prepare mousepointer char's bitmaps */
-	pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
-	bcopy(scp->font + sc_vtb_getc(&scp->scr, pos)*scp->font_size,
-	      &font_buf[0], scp->font_size);
-	bcopy(scp->font + sc_vtb_getc(&scp->scr, pos + 1)*scp->font_size,
-	      &font_buf[32], scp->font_size);
-	bcopy(scp->font 
-		 + sc_vtb_getc(&scp->scr, pos + scp->xsize)*scp->font_size,
-	      &font_buf[64], scp->font_size);
-	bcopy(scp->font
-		 + sc_vtb_getc(&scp->scr, pos + scp->xsize + 1)*scp->font_size,
-	      &font_buf[96], scp->font_size);
-	for (i = 0; i < scp->font_size; ++i) {
-		cursor[i] = font_buf[i]<<8 | font_buf[i+32];
-		cursor[i + scp->font_size] = font_buf[i+64]<<8 | font_buf[i+96];
-	}
-
-	/* now and-or in the mousepointer image */
-	xoffset = x%8;
-	yoffset = y%scp->font_size;
-	for (i = 0; i < 16; ++i) {
-		cursor[i + yoffset] =
-	    		(cursor[i + yoffset] & ~(mouse_and_mask[i] >> xoffset))
-	    		| (mouse_or_mask[i] >> xoffset);
-	}
-	for (i = 0; i < scp->font_size; ++i) {
-		font_buf[i] = (cursor[i] & 0xff00) >> 8;
-		font_buf[i + 32] = cursor[i] & 0xff;
-		font_buf[i + 64] = (cursor[i + scp->font_size] & 0xff00) >> 8;
-		font_buf[i + 96] = cursor[i + scp->font_size] & 0xff;
-	}
-
-#if 1
-	/* wait for vertical retrace to avoid jitter on some videocards */
-	crtc_addr = scp->sc->adp->va_crtc_addr;
-	while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ;
-#endif
-	c = scp->sc->mouse_char;
-	(*vidsw[scp->sc->adapter]->load_font)(scp->sc->adp, 0, 32, font_buf,
-					      c, 4); 
-
-	sc_vtb_putc(&scp->scr, pos, c, sc_vtb_geta(&scp->scr, pos));
-	/* FIXME: may be out of range! */
-	sc_vtb_putc(&scp->scr, pos + scp->xsize, c + 2,
-		    sc_vtb_geta(&scp->scr, pos + scp->xsize));
-	if (x < (scp->xsize - 1)*8) {
-		sc_vtb_putc(&scp->scr, pos + 1, c + 1,
-			    sc_vtb_geta(&scp->scr, pos + 1));
-		sc_vtb_putc(&scp->scr, pos + scp->xsize + 1, c + 3,
-			    sc_vtb_geta(&scp->scr, pos + scp->xsize + 1));
-	}
-    } else
-#endif /* SC_ALT_MOUSE_IMAGE */
-    {
-	/* Red, magenta and brown are mapped to green to to keep it readable */
-	static const int col_conv[16] = {
-		6, 6, 6, 6, 2, 2, 2, 6, 14, 14, 14, 14, 10, 10, 10, 14
-	};
-	int pos;
-	int color;
-	int a;
-
-	pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff;
-	a = sc_vtb_geta(&scp->scr, pos);
-	if (scp->sc->adp->va_flags & V_ADP_COLOR)
-		color = (col_conv[(a & 0xf000) >> 12] << 12)
-			| ((a & 0x0f00) | 0x0800);
-	else
-		color = ((a & 0xf000) >> 4) | ((a & 0x0f00) << 4);
-	sc_vtb_putc(&scp->scr, pos, sc_vtb_getc(&scp->scr, pos), color);
-    }
-}
-
-static void
-remove_txtmouse(scr_stat *scp, int x, int y)
-{
-}
-
-static void 
-vga_txtmouse(scr_stat *scp, int x, int y, int on)
-{
-	if (on)
-		draw_txtmouse(scp, x, y);
-	else
-		remove_txtmouse(scp, x, y);
-}
-
-#endif /* SC_NO_CUTPASTE */
-
-#ifdef SC_PIXEL_MODE
-
-/* pixel (raster text) mode renderer */
-
-static void
-vga_pxlclear(scr_stat *scp, int c, int attr)
-{
-	vm_offset_t p;
-	int line_width;
-	int lines;
-	int i;
-
-	/* XXX: we are just filling the screen with the background color... */
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	outw(GDCIDX, ((attr & 0xf000) >> 4) | 0x00); /* set/reset */
-	line_width = scp->sc->adp->va_line_width;
-	lines = scp->ysize*scp->font_size; 
-	p = scp->sc->adp->va_window + line_width*scp->yoff*scp->font_size
-		+ scp->xoff;
-	for (i = 0; i < lines; ++i) {
-		bzero_io((void *)p, scp->xsize);
-		p += line_width;
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-}
-
-static void
-vga_pxlborder(scr_stat *scp, int color)
-{
-	vm_offset_t p;
-	int line_width;
-	int x;
-	int y;
-	int i;
-
-	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
-
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	outw(GDCIDX, (color << 8) | 0x00);	/* set/reset */
-	line_width = scp->sc->adp->va_line_width;
-	p = scp->sc->adp->va_window;
-	if (scp->yoff > 0)
-		bzero_io((void *)p, line_width*scp->yoff*scp->font_size);
-	y = (scp->yoff + scp->ysize)*scp->font_size;
-	if (scp->ypixel > y)
-		bzero_io((void *)(p + line_width*y), line_width*(scp->ypixel - y));
-	y = scp->yoff*scp->font_size;
-	x = scp->xpixel/8 - scp->xoff - scp->xsize;
-	for (i = 0; i < scp->ysize*scp->font_size; ++i) {
-		if (scp->xoff > 0)
-			bzero_io((void *)(p + line_width*(y + i)), scp->xoff);
-		if (x > 0)
-			bzero_io((void *)(p + line_width*(y + i)
-				     + scp->xoff + scp->xsize), x);
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-}
-
-static void 
-vga_egadraw(scr_stat *scp, int from, int count, int flip)
-{
-	vm_offset_t d;
-	vm_offset_t e;
-	u_char *f;
-	u_short bg;
-	u_short col1, col2;
-	int line_width;
-	int i, j;
-	int a;
-	u_char c;
-
-	line_width = scp->sc->adp->va_line_width;
-	d = scp->sc->adp->va_window
-		+ scp->xoff 
-		+ scp->yoff*scp->font_size*line_width 
-		+ (from%scp->xsize) 
-		+ scp->font_size*line_width*(from/scp->xsize);
-
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	bg = -1;
-	if (from + count > scp->xsize*scp->ysize)
-		count = scp->xsize*scp->ysize - from;
-	for (i = from; count-- > 0; ++i) {
-		a = sc_vtb_geta(&scp->vtb, i);
-		if (flip) {
-			col1 = ((a & 0x7000) >> 4) | (a & 0x0800);
-			col2 = ((a & 0x8000) >> 4) | (a & 0x0700);
-		} else {
-			col1 = (a & 0x0f00);
-			col2 = (a & 0xf000) >> 4;
-		}
-		/* set background color in EGA/VGA latch */
-		if (bg != col2) {
-			bg = col2;
-			outw(GDCIDX, bg | 0x00);	/* set/reset */
-			outw(GDCIDX, 0xff08);		/* bit mask */
-			writeb(d, 0);
-			c = readb(d);	/* set bg color in the latch */
-		}
-		/* foreground color */
-		outw(GDCIDX, col1 | 0x00);		/* set/reset */
-		e = d;
-		f = &(scp->font[sc_vtb_getc(&scp->vtb, i)*scp->font_size]);
-		for (j = 0; j < scp->font_size; ++j, ++f) {
-			outw(GDCIDX, (*f << 8) | 0x08);	/* bit mask */
-	        	writeb(e, 0);
-			e += line_width;
-		}
-		++d;
-		if ((i % scp->xsize) == scp->xsize - 1)
-			d += scp->xoff*2 
-				 + (scp->font_size - 1)*line_width;
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-}
-
-static void 
-vga_vgadraw(scr_stat *scp, int from, int count, int flip)
-{
-	vm_offset_t d;
-	vm_offset_t e;
-	u_char *f;
-	u_short bg;
-	u_short col1, col2;
-	int line_width;
-	int i, j;
-	int a;
-	u_char c;
-
-	line_width = scp->sc->adp->va_line_width;
-	d = scp->sc->adp->va_window
-		+ scp->xoff 
-		+ scp->yoff*scp->font_size*line_width 
-		+ (from%scp->xsize) 
-		+ scp->font_size*line_width*(from/scp->xsize);
-
-	outw(GDCIDX, 0x0305);		/* read mode 0, write mode 3 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	bg = -1;
-	if (from + count > scp->xsize*scp->ysize)
-		count = scp->xsize*scp->ysize - from;
-	for (i = from; count-- > 0; ++i) {
-		a = sc_vtb_geta(&scp->vtb, i);
-		if (flip) {
-			col1 = ((a & 0x7000) >> 4) | (a & 0x0800);
-			col2 = ((a & 0x8000) >> 4) | (a & 0x0700);
-		} else {
-			col1 = (a & 0x0f00);
-			col2 = (a & 0xf000) >> 4;
-		}
-		/* set background color in EGA/VGA latch */
-		if (bg != col2) {
-			bg = col2;
-			outw(GDCIDX, 0x0005);	/* read mode 0, write mode 0 */
-			outw(GDCIDX, bg | 0x00); /* set/reset */
-			writeb(d, 0);
-			c = readb(d);		/* set bg color in the latch */
-			outw(GDCIDX, 0x0305);	/* read mode 0, write mode 3 */
-		}
-		/* foreground color */
-		outw(GDCIDX, col1 | 0x00);	/* set/reset */
-		e = d;
-		f = &(scp->font[sc_vtb_getc(&scp->vtb, i)*scp->font_size]);
-		for (j = 0; j < scp->font_size; ++j, ++f) {
-	        	writeb(e, *f);
-			e += line_width;
-		}
-		++d;
-		if ((i % scp->xsize) == scp->xsize - 1)
-			d += scp->xoff*2 
-				 + (scp->font_size - 1)*line_width;
-	}
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-}
-
-static void 
-vga_pxlcursor_shape(scr_stat *scp, int base, int height, int blink)
-{
-	if (base < 0 || base >= scp->font_size)
-		return;
-	/* the caller may set height <= 0 in order to disable the cursor */
-#if 0
-	scp->curs_attr.base = base;
-	scp->curs_attr.height = height;
 #endif
-}
 
 static void 
-draw_pxlcursor(scr_stat *scp, int at, int on, int flip)
+gfb_cursor(scr_stat *scp, int at, int blink, int on, int flip)
 {
-	vm_offset_t d;
-	u_char *f;
-	int line_width;
-	int height;
-	int col;
-	int a;
-	int i;
-	u_char c;
-
-	line_width = scp->sc->adp->va_line_width;
-	d = scp->sc->adp->va_window
-		+ scp->xoff 
-		+ scp->yoff*scp->font_size*line_width 
-		+ (at%scp->xsize) 
-		+ scp->font_size*line_width*(at/scp->xsize)
-		+ (scp->font_size - scp->curs_attr.base - 1)*line_width;
-
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	/* set background color in EGA/VGA latch */
-	a = sc_vtb_geta(&scp->vtb, at);
-	if (flip)
-		col = (on) ? ((a & 0xf000) >> 4) : (a & 0x0f00);
-	else
-		col = (on) ? (a & 0x0f00) : ((a & 0xf000) >> 4);
-	outw(GDCIDX, col | 0x00);	/* set/reset */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	writeb(d, 0);
-	c = readb(d);			/* set bg color in the latch */
-	/* foreground color */
-	if (flip)
-		col = (on) ? (a & 0x0f00) : ((a & 0xf000) >> 4);
-	else
-		col = (on) ? ((a & 0xf000) >> 4) : (a & 0x0f00);
-	outw(GDCIDX, col | 0x00);	/* set/reset */
-	f = &(scp->font[sc_vtb_getc(&scp->vtb, at)*scp->font_size
-		+ scp->font_size - scp->curs_attr.base - 1]);
-	height = imin(scp->curs_attr.height, scp->font_size);
-	for (i = 0; i < height; ++i, --f) {
-		outw(GDCIDX, (*f << 8) | 0x08);	/* bit mask */
-	       	writeb(d, 0);
-		d -= line_width;
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-}
-
-static int pxlblinkrate = 0;
+	video_adapter_t *adp;
 
-static void 
-vga_pxlcursor(scr_stat *scp, int at, int blink, int on, int flip)
-{
-	if (scp->curs_attr.height <= 0)	/* the text cursor is disabled */
+	adp = scp->sc->adp;
+	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
 		return;
 
 	if (on) {
 		if (!blink) {
 			scp->status |= VR_CURSOR_ON;
-			draw_pxlcursor(scp, at, on, flip);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+			    at%scp->xsize, at/scp->xsize);
 		} else if (++pxlblinkrate & 4) {
 			pxlblinkrate = 0;
 			scp->status ^= VR_CURSOR_ON;
-			draw_pxlcursor(scp, at,
-				       scp->status & VR_CURSOR_ON,
-				       flip);
+			if(scp->status & VR_CURSOR_ON)
+				(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+				    at%scp->xsize, at/scp->xsize);
+			else
+				(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1,
+				    -1);
 		}
 	} else {
 		if (scp->status & VR_CURSOR_ON)
-			draw_pxlcursor(scp, at, on, flip);
+			(*vidsw[adp->va_index]->set_hw_cursor)(adp,
+			    at%scp->xsize, at/scp->xsize);
 		scp->status &= ~VR_CURSOR_ON;
 	}
 	if (blink)
@@ -707,7 +287,7 @@ vga_pxlcursor(scr_stat *scp, int at, int blink, int on, int flip)
 }
 
 static void
-vga_pxlblink(scr_stat *scp, int at, int flip)
+gfb_blink(scr_stat *scp, int at, int flip)
 {
 	if (!(scp->status & VR_CURSOR_BLINK))
 		return;
@@ -715,163 +295,35 @@ vga_pxlblink(scr_stat *scp, int at, int flip)
 		return;
 	pxlblinkrate = 0;
 	scp->status ^= VR_CURSOR_ON;
-	draw_pxlcursor(scp, at, scp->status & VR_CURSOR_ON, flip);
+	gfb_cursor(scp, at, scp->status & VR_CURSOR_BLINK,
+	    scp->status & VR_CURSOR_ON, flip);
 }
 
 #ifndef SC_NO_CUTPASTE
 
-static void
-draw_pxlmouse(scr_stat *scp, int x, int y)
-{
-	vm_offset_t p;
-	int line_width;
-	int xoff, yoff;
-	int ymax;
-	u_short m;
-	int i, j;
-
-	line_width = scp->sc->adp->va_line_width;
-	xoff = (x - scp->xoff*8)%8;
-	yoff = y - (y/line_width)*line_width;
-	ymax = imin(y + 16, scp->ypixel);
-
-	outw(GDCIDX, 0x0805);		/* read mode 1, write mode 0 */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-	outw(GDCIDX, 0x0002);		/* color compare */
-	outw(GDCIDX, 0x0007);		/* color don't care */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	outw(GDCIDX, 0x0803);		/* data rotate/function select (and) */
-	p = scp->sc->adp->va_window + line_width*y + x/8;
-	if (x < scp->xpixel - 8) {
-		for (i = y, j = 0; i < ymax; ++i, ++j) {
-			m = ~(mouse_and_mask[j] >> xoff);
-#ifdef __i386__
-			*(u_char *)p &= m >> 8;
-			*(u_char *)(p + 1) &= m;
-#elif defined(__alpha__)
-			writeb(p, readb(p) & (m >> 8));
-			writeb(p + 1, readb(p + 1) & (m >> 8));
-#endif
-			p += line_width;
-		}
-	} else {
-		xoff += 8;
-		for (i = y, j = 0; i < ymax; ++i, ++j) {
-			m = ~(mouse_and_mask[j] >> xoff);
-#ifdef __i386__
-			*(u_char *)p &= m;
-#elif defined(__alpha__)
-			writeb(p, readb(p) & (m >> 8));
-#endif
-			p += line_width;
-		}
-	}
-	outw(GDCIDX, 0x1003);		/* data rotate/function select (or) */
-	p = scp->sc->adp->va_window + line_width*y + x/8;
-	if (x < scp->xpixel - 8) {
-		for (i = y, j = 0; i < ymax; ++i, ++j) {
-			m = mouse_or_mask[j] >> xoff;
-#ifdef __i386__
-			*(u_char *)p &= m >> 8;
-			*(u_char *)(p + 1) &= m;
-#elif defined(__alpha__)
-			writeb(p, readb(p) & (m >> 8));
-			writeb(p + 1, readb(p + 1) & (m >> 8));
-#endif
-			p += line_width;
-		}
-	} else {
-		for (i = y, j = 0; i < ymax; ++i, ++j) {
-			m = mouse_or_mask[j] >> xoff;
-#ifdef __i386__
-			*(u_char *)p &= m;
-#elif defined(__alpha__)
-			writeb(p, readb(p) & (m >> 8));
-#endif
-			p += line_width;
-		}
-	}
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-}
-
-static void
-remove_pxlmouse(scr_stat *scp, int x, int y)
-{
-	vm_offset_t p;
-	int col, row;
-	int pos;
-	int line_width;
-	int ymax;
-	int i;
-
-	/* erase the mouse cursor image */
-	col = x/8 - scp->xoff;
-	row = y/scp->font_size - scp->yoff;
-	pos = row*scp->xsize + col;
-	i = (col < scp->xsize - 1) ? 2 : 1;
-	(*scp->rndr->draw)(scp, pos, i, FALSE);
-	if (row < scp->ysize - 1)
-		(*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE);
-
-	/* paint border if necessary */
-	line_width = scp->sc->adp->va_line_width;
-	outw(GDCIDX, 0x0005);		/* read mode 0, write mode 0 */
-	outw(GDCIDX, 0x0003);		/* data rotate/function select */
-	outw(GDCIDX, 0x0f01);		/* set/reset enable */
-	outw(GDCIDX, 0xff08);		/* bit mask */
-	outw(GDCIDX, (scp->border << 8) | 0x00);	/* set/reset */
-	if (row == scp->ysize - 1) {
-		i = (scp->ysize + scp->yoff)*scp->font_size;
-		ymax = imin(i + scp->font_size, scp->ypixel);
-		p = scp->sc->adp->va_window + i*line_width + scp->xoff + col;
-		if (col < scp->xsize - 1) {
-			for (; i < ymax; ++i) {
-				writeb(p, 0);
-				writeb(p + 1, 0);
-				p += line_width;
-			}
-		} else {
-			for (; i < ymax; ++i) {
-				writeb(p, 0);
-				p += line_width;
-			}
-		}
-	}
-	if ((col == scp->xsize - 1) && (scp->xoff > 0)) {
-		i = (row + scp->yoff)*scp->font_size;
-		ymax = imin(i + scp->font_size*2, scp->ypixel);
-		p = scp->sc->adp->va_window + i*line_width
-			+ scp->xoff + scp->xsize;
-		for (; i < ymax; ++i) {
-			writeb(p, 0);
-			p += line_width;
-		}
-	}
-	outw(GDCIDX, 0x0000);		/* set/reset */
-	outw(GDCIDX, 0x0001);		/* set/reset enable */
-}
-
 static void 
-vga_pxlmouse(scr_stat *scp, int x, int y, int on)
+gfb_mouse(scr_stat *scp, int x, int y, int on)
 {
-	if (on)
-		draw_pxlmouse(scp, x, y);
-	else
-		remove_pxlmouse(scp, x, y);
-}
-
-#endif /* SC_NO_CUTPASTE */
-#endif /* SC_PIXEL_MODE */
+	int i, pos;
 
-#ifndef SC_NO_MODE_CHANGE
+	if (on) {
 
-/* graphics mode renderer */
+		/* Display the mouse pointer image... */
+		(*vidsw[scp->sc->adapter]->putm)(scp->sc->adp, x, y,
+		    mouse_pointer, 0xffffffff, 16);
+	} else {
 
-static void
-vga_grborder(scr_stat *scp, int color)
-{
-	(*vidsw[scp->sc->adapter]->set_border)(scp->sc->adp, color);
+		/*
+		   Erase the mouse cursor image by redrawing the text
+		   underneath it...
+		*/
+		return;
+		pos = x*scp->xsize + y;
+		i = (y < scp->xsize - 1) ? 2 : 1;
+		(*scp->rndr->draw)(scp, pos, i, FALSE);
+		if (x < scp->ysize - 1)
+			(*scp->rndr->draw)(scp, pos + scp->xsize, i, FALSE);
+	}
 }
 
-#endif
+#endif /* SC_NO_CUTPASTE */