[src/trunk]: src/sys/arch/i386 get some more info out of the VESA BIOS and at...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65708715d07e
branches:  trunk
changeset: 533902:65708715d07e
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Jul 10 19:15:42 2002 +0000

description:
get some more info out of the VESA BIOS and attach subdevices for
8-bit pseudo color and text modes
still doesn't do anything useful
(It would be easy to attach a wsdisplay, but we have to cooperate with the
PCI or ISA attached VGA drivers. There are open issues.)

diffstat:

 sys/arch/i386/bios/vesa_raster8.c |  183 +++++++++++++++++++++++++++++
 sys/arch/i386/bios/vesa_text.c    |   57 +++++++++
 sys/arch/i386/bios/vesabios.c     |  236 ++++++++++++++++++++++++++++++++++---
 sys/arch/i386/bios/vesabios.h     |    8 +-
 sys/arch/i386/bios/vesabiosreg.h  |   27 ++++
 sys/arch/i386/conf/files.i386     |   15 ++-
 6 files changed, 501 insertions(+), 25 deletions(-)

diffs (truncated from 611 to 300 lines):

diff -r 8f0aff8bb82c -r 65708715d07e sys/arch/i386/bios/vesa_raster8.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/bios/vesa_raster8.c Wed Jul 10 19:15:42 2002 +0000
@@ -0,0 +1,183 @@
+/* $NetBSD: vesa_raster8.c,v 1.1 2002/07/10 19:15:42 drochner Exp $ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <machine/frame.h>
+#include <machine/kvm86.h>
+#include <machine/bus.h>
+
+#include <arch/i386/bios/vesabios.h>
+#include <arch/i386/bios/vesabiosreg.h>
+
+#include <dev/wscons/wsdisplayvar.h>
+#include <dev/rasops/rasops.h>
+
+static int vesaraster8_match(struct device *, struct cfdata *, void *);
+static void vesaraster8_attach(struct device *, struct device *, void *);
+
+struct vesaraster8sc {
+       struct device sc_dev;
+       int sc_mode;
+       struct rasops_info sc_ri;
+};
+
+struct cfattach vesarasterviii_ca = {
+       sizeof(struct vesaraster8sc), vesaraster8_match, vesaraster8_attach
+};
+
+static int
+vesaraster8_match(parent, match, aux)
+       struct device *parent;
+       struct cfdata *match;
+       void *aux;
+{
+       struct vesabiosdev_attach_args *vaa = aux;
+
+       if (strcmp(vaa->vbaa_type, "raster8"))
+               return (0);
+
+       return (1);
+}
+
+static void
+vesaraster8_attach(parent, dev, aux)
+       struct device *parent, *dev;
+       void *aux;
+{
+       struct vesaraster8sc *sc = (struct vesaraster8sc *)dev;
+       struct vesabiosdev_attach_args *vaa = aux;
+       unsigned char *buf;
+       struct trapframe tf;
+       int res;
+       struct modeinfoblock *mi;
+       struct rasops_info *ri;
+       bus_space_handle_t h;
+
+       buf = kvm86_bios_addpage(0x2000);
+       if (!buf) {
+               printf("vesaraster8_attach: kvm86_bios_addpage(0x2000) failed\n");
+               return;
+       }
+
+       sc->sc_mode = vaa->vbaa_modes[0]; /* XXX */
+
+       memset(&tf, 0, sizeof(struct trapframe));
+       tf.tf_eax = 0x4f01; /* function code */
+       tf.tf_ecx = sc->sc_mode;
+       tf.tf_es = 0;
+       tf.tf_edi = 0x2000; /* buf ptr */
+
+       res = kvm86_bioscall(0x10, &tf);
+       if (res || tf.tf_eax != 0x004f) {
+               printf("vbecall: res=%d, ax=%x\n", res, tf.tf_eax);
+               goto out;
+       }
+       mi = (struct modeinfoblock *)buf;
+
+       ri = &sc->sc_ri;
+       ri->ri_flg = RI_CENTER;
+       ri->ri_depth = 8;
+       ri->ri_width = mi->XResolution;
+       ri->ri_height = mi->YResolution;
+       ri->ri_stride = mi->BytesPerScanLine;
+
+       res = _i386_memio_map(I386_BUS_SPACE_MEM, mi->PhysBasePtr,
+                             ri->ri_height * ri->ri_stride,
+                             BUS_SPACE_MAP_LINEAR, &h);
+       if (res) {
+               printf("framebuffer mapping failed\n");
+               goto out;
+       }
+       ri->ri_bits = bus_space_vaddr(I386_BUS_SPACE_MEM, h);
+
+       printf(": fb %dx%d @%x\n", ri->ri_width, ri->ri_height,
+              mi->PhysBasePtr);
+out:
+       kvm86_bios_delpage(0x2000, buf);
+       return;
+}
+
+#if 0
+static void
+vb8test(sc)
+       struct vesaraster8sc *sc;
+{
+       struct trapframe tf;
+       int res;
+       int savbufsiz, i;
+       char *errstr = 0;
+       struct rasops_info *ri = &sc->sc_ri;
+       u_long attr;
+
+       memset(&tf, 0, sizeof(struct trapframe));
+       tf.tf_eax = 0x4f04; /* function code */
+       tf.tf_edx = 0x0000; /* query */
+       tf.tf_ecx = 0x000f;
+
+       res = kvm86_bioscall(0x10, &tf);
+       if (res || tf.tf_eax != 0x004f) {
+               printf("vbecall: res=%d, ax=%x\n", res, tf.tf_eax);
+               return;
+       }
+       savbufsiz = roundup(tf.tf_ebx * 64, NBPG) / NBPG;
+       printf("savbuf: %d pg\n", savbufsiz);
+
+       for (i = 0; i < savbufsiz; i++)
+               (void)kvm86_bios_addpage(0x3000 + i * 0x1000);
+
+       memset(&tf, 0, sizeof(struct trapframe));
+       tf.tf_eax = 0x4f04; /* function code */
+       tf.tf_edx = 0x0001; /* save */
+       tf.tf_ecx = 0x000f; /* all (but framebuffer) */
+       tf.tf_es = 0;
+       tf.tf_ebx = 0x3000; /* buffer */
+
+       res = kvm86_bioscall(0x10, &tf);
+       if (res || tf.tf_eax != 0x004f) {
+               printf("vbecall: res=%d, ax=%x\n", res, tf.tf_eax);
+               return;
+       }
+
+       memset(&tf, 0, sizeof(struct trapframe));
+       tf.tf_eax = 0x4f02; /* function code */
+       tf.tf_ebx = sc->sc_mode | 0x4000; /* flat */
+       tf.tf_ebx |= 0x8000; /* XXX no clear (save fonts in fb) */
+
+       res = kvm86_bioscall(0x10, &tf);
+       if (res || tf.tf_eax != 0x004f) {
+               printf("vbecall: res=%d, ax=%x\n", res, tf.tf_eax);
+               return;
+       }
+
+       if (rasops_init(ri, 20, 50)) {
+               errstr = "rasops_init";
+               goto back;
+       }
+
+       ri->ri_ops.allocattr(ri, 0, 0, 0, &attr);
+       ri->ri_ops.putchar(ri, 1, 1, 'X', attr);
+       ri->ri_ops.putchar(ri, 1, 2, 'Y', attr);
+       ri->ri_ops.putchar(ri, 1, 3, 'Z', attr);
+
+       delay(5000000);
+       errstr = 0;
+back:
+       memset(&tf, 0, sizeof(struct trapframe));
+       tf.tf_eax = 0x4f04; /* function code */
+       tf.tf_edx = 0x0002; /* restore */
+       tf.tf_ecx = 0x000f;
+       tf.tf_es = 0;
+       tf.tf_ebx = 0x3000; /* buffer */
+
+       res = kvm86_bioscall(0x10, &tf);
+       if (res || tf.tf_eax != 0x004f) {
+               printf("vbecall: res=%d, ax=%x\n", res, tf.tf_eax);
+               return;
+       }
+
+       if (errstr)
+               printf("error: %s\n", errstr);
+}
+#endif
diff -r 8f0aff8bb82c -r 65708715d07e sys/arch/i386/bios/vesa_text.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/bios/vesa_text.c    Wed Jul 10 19:15:42 2002 +0000
@@ -0,0 +1,57 @@
+/* $NetBSD: vesa_text.c,v 1.1 2002/07/10 19:15:43 drochner Exp $ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <machine/frame.h>
+#include <machine/kvm86.h>
+#include <machine/bus.h>
+
+#include <arch/i386/bios/vesabios.h>
+#include <arch/i386/bios/vesabiosreg.h>
+
+static int vesatext_match(struct device *, struct cfdata *, void *);
+static void vesatext_attach(struct device *, struct device *, void *);
+
+struct vesatextsc {
+       struct device sc_dev;
+       int *sc_modes;
+       int sc_nmodes;
+};
+
+struct cfattach vesatext_ca = {
+       sizeof(struct vesatextsc), vesatext_match, vesatext_attach
+};
+
+static int
+vesatext_match(parent, match, aux)
+       struct device *parent;
+       struct cfdata *match;
+       void *aux;
+{
+       struct vesabiosdev_attach_args *vaa = aux;
+
+       if (strcmp(vaa->vbaa_type, "text"))
+               return (0);
+
+       return (1);
+}
+
+static void
+vesatext_attach(parent, dev, aux)
+       struct device *parent, *dev;
+       void *aux;
+{
+       struct vesatextsc *sc = (struct vesatextsc *)dev;
+       struct vesabiosdev_attach_args *vaa = aux;
+       int i;
+
+       sc->sc_modes = malloc(vaa->vbaa_nmodes * sizeof(int),
+                             M_DEVBUF, M_NOWAIT);
+       sc->sc_nmodes = vaa->vbaa_nmodes;
+       for (i = 0; i < vaa->vbaa_nmodes; i++)
+               sc->sc_modes[i] = vaa->vbaa_modes[i];
+
+       printf("\n");
+}
diff -r 8f0aff8bb82c -r 65708715d07e sys/arch/i386/bios/vesabios.c
--- a/sys/arch/i386/bios/vesabios.c     Wed Jul 10 19:09:35 2002 +0000
+++ b/sys/arch/i386/bios/vesabios.c     Wed Jul 10 19:15:42 2002 +0000
@@ -1,12 +1,16 @@
-/* $NetBSD: vesabios.c,v 1.1 2002/07/07 12:59:58 drochner Exp $ */
+/* $NetBSD: vesabios.c,v 1.2 2002/07/10 19:15:43 drochner Exp $ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/malloc.h>
 #include <machine/frame.h>
 #include <machine/kvm86.h>
 
 #include <arch/i386/bios/vesabios.h>
+#include <arch/i386/bios/vesabiosreg.h>
+
+#include "opt_vesabios.h"
 
 struct vbeinfoblock
 {
@@ -21,10 +25,20 @@
        /* data area, in total max 512 bytes for VBE 2.0 */
 } __attribute__ ((packed));
 
+#define FAR2FLATPTR(p) ((p & 0xffff) + ((p >> 12) & 0xffff0))
+
 static int vesabios_match(struct device *, struct cfdata *, void *);
+static void vesabios_attach(struct device *, struct device *, void *);
+static int vesabios_print(void *, const char *);
+
+static int vbegetinfo(struct vbeinfoblock **);
+static void vbefreeinfo(struct vbeinfoblock *);
+#ifdef VESABIOSVERBOSE
+static const char *mm2txt(unsigned int);
+#endif
 
 struct cfattach vesabios_ca = {
-       sizeof(struct device), vesabios_match, 0
+       sizeof(struct device), vesabios_match, vesabios_attach
 };
 
 static int
@@ -39,21 +53,21 @@
        if (strcmp(vaa->vaa_busname, "vesabios") != 0)
                return (0);
 
-       return (0); /* XXX for now */
+       return (1);
 }
 
-int