[src/trunk]: src/sys/dev/pci/voyager switch to 32bit colour for X, switch bac...

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

details:   https://anonhg.NetBSD.org/src/rev/436c9c95e4b0
branches:  trunk
changeset: 771078:436c9c95e4b0
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Nov 08 07:05:06 2011 +0000

description:
switch to 32bit colour for X, switch back to 8 bit for console emulation

diffstat:

 sys/dev/pci/voyager/voyagerfb.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 134238b758f9 -r 436c9c95e4b0 sys/dev/pci/voyager/voyagerfb.c
--- a/sys/dev/pci/voyager/voyagerfb.c   Tue Nov 08 06:56:36 2011 +0000
+++ b/sys/dev/pci/voyager/voyagerfb.c   Tue Nov 08 07:05:06 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: voyagerfb.c,v 1.8 2011/11/08 06:56:07 macallan Exp $   */
+/*     $NetBSD: voyagerfb.c,v 1.9 2011/11/08 07:05:06 macallan Exp $   */
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.8 2011/11/08 06:56:07 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.9 2011/11/08 07:05:06 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -359,7 +359,7 @@
                wdf = (void *)data;
                wdf->height = ms->scr_ri.ri_height;
                wdf->width = ms->scr_ri.ri_width;
-               wdf->depth = ms->scr_ri.ri_depth;
+               wdf->depth = 32;
                wdf->cmsize = 256;
                return 0;
 
@@ -380,8 +380,13 @@
                if (new_mode != sc->sc_mode) {
                        sc->sc_mode = new_mode;
                        if(new_mode == WSDISPLAYIO_MODE_EMUL) {
+                               sc->sc_depth = 8;
+                               voyagerfb_init(sc);
                                voyagerfb_restore_palette(sc);
                                vcons_redraw_screen(ms);
+                       } else {
+                               sc->sc_depth = 32;
+                               voyagerfb_init(sc);
                        }
                }
                }