Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys use rasops_init(0, 0)



details:   https://anonhg.NetBSD.org/src/rev/c608a10a8a46
branches:  trunk
changeset: 772670:c608a10a8a46
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jan 11 15:53:32 2012 +0000

description:
use rasops_init(0, 0)

diffstat:

 sys/arch/sparc/dev/cgfourteen.c |  5 ++---
 sys/arch/sparc64/dev/ffb.c      |  6 +++---
 sys/arch/sparc64/dev/gfb.c      |  6 +++---
 sys/dev/pci/machfb.c            |  7 +++----
 sys/dev/pci/pm2fb.c             |  9 ++++-----
 sys/dev/pci/r128fb.c            |  6 +++---
 sys/dev/pci/radeonfb.c          |  6 +++---
 sys/dev/pci/voodoofb.c          |  6 +++---
 sys/dev/pci/wcfb.c              |  6 +++---
 9 files changed, 27 insertions(+), 30 deletions(-)

diffs (246 lines):

diff -r 545a7dd18b57 -r c608a10a8a46 sys/arch/sparc/dev/cgfourteen.c
--- a/sys/arch/sparc/dev/cgfourteen.c   Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/arch/sparc/dev/cgfourteen.c   Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgfourteen.c,v 1.66 2011/04/13 23:31:25 macallan Exp $ */
+/*     $NetBSD: cgfourteen.c,v 1.67 2012/01/11 15:54:44 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -1020,8 +1020,7 @@
                ri->ri_flg |= RI_CLEAR;
        }
 
-       rasops_init(ri, sc->sc_fb.fb_type.fb_height / 8,
-            sc->sc_fb.fb_type.fb_width / 8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
        rasops_reconfig(ri,
diff -r 545a7dd18b57 -r c608a10a8a46 sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c        Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/arch/sparc64/dev/ffb.c        Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb.c,v 1.49 2011/12/22 05:08:05 macallan Exp $        */
+/*     $NetBSD: ffb.c,v 1.50 2012/01/11 15:53:32 macallan Exp $        */
 /*     $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $      */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.49 2011/12/22 05:08:05 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.50 2012/01/11 15:53:32 macallan Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1188,7 +1188,7 @@
 #endif
        DPRINTF(("ffb_init_screen: addr: %08lx\n",(ulong)ri->ri_bits));
 
-       rasops_init(ri, sc->sc_height/8, sc->sc_width/8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
        rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
                    sc->sc_width / ri->ri_font->fontwidth);
diff -r 545a7dd18b57 -r c608a10a8a46 sys/arch/sparc64/dev/gfb.c
--- a/sys/arch/sparc64/dev/gfb.c        Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/arch/sparc64/dev/gfb.c        Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $   */
+/*     $NetBSD: gfb.c,v 1.5 2012/01/11 15:53:32 macallan Exp $ */
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.5 2012/01/11 15:53:32 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -357,7 +357,7 @@
                ri->ri_flg |= RI_CLEAR;
        }
 
-       rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
        rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
diff -r 545a7dd18b57 -r c608a10a8a46 sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c      Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/dev/pci/machfb.c      Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machfb.c,v 1.71 2011/08/04 00:57:33 jakllsch Exp $     */
+/*     $NetBSD: machfb.c,v 1.72 2012/01/11 16:02:29 macallan Exp $     */
 
 /*
  * Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, 
-       "$NetBSD: machfb.c,v 1.71 2011/08/04 00:57:33 jakllsch Exp $");
+       "$NetBSD: machfb.c,v 1.72 2012/01/11 16:02:29 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -825,8 +825,7 @@
                }
        }
        
-       rasops_init(ri, sc->sc_my_mode->vdisplay / 8,
-           sc->sc_my_mode->hdisplay / 8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
        rasops_reconfig(ri, sc->sc_my_mode->vdisplay / ri->ri_font->fontheight,
                    sc->sc_my_mode->hdisplay / ri->ri_font->fontwidth);
diff -r 545a7dd18b57 -r c608a10a8a46 sys/dev/pci/pm2fb.c
--- a/sys/dev/pci/pm2fb.c       Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/dev/pci/pm2fb.c       Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm2fb.c,v 1.10 2011/11/24 05:57:17 macallan Exp $      */
+/*     $NetBSD: pm2fb.c,v 1.11 2012/01/11 16:02:30 macallan Exp $      */
 
 /*
  * Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.10 2011/11/24 05:57:17 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.11 2012/01/11 16:02:30 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -304,8 +304,7 @@
        ri = &sc->sc_console_screen.scr_ri;
 
        j = 0;
-       for (i = 0; i < (1 << sc->sc_depth); i++) {
-
+       for (i = 0; i < 256; i++) {
                sc->sc_cmap_red[i] = rasops_cmap[j];
                sc->sc_cmap_green[i] = rasops_cmap[j + 1];
                sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
@@ -477,7 +476,7 @@
        ri->ri_stride = sc->sc_stride;
        ri->ri_flg = RI_CENTER;
 
-       rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
        rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
diff -r 545a7dd18b57 -r c608a10a8a46 sys/dev/pci/r128fb.c
--- a/sys/dev/pci/r128fb.c      Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/dev/pci/r128fb.c      Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: r128fb.c,v 1.26 2012/01/04 15:56:18 macallan Exp $     */
+/*     $NetBSD: r128fb.c,v 1.27 2012/01/11 16:02:29 macallan Exp $     */
 
 /*
  * Copyright (c) 2007 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.26 2012/01/04 15:56:18 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.27 2012/01/11 16:02:29 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -534,7 +534,7 @@
        if (sc->sc_depth == 8)
                ri->ri_flg |= RI_8BIT_IS_RGB | RI_ENABLE_ALPHA;
 
-       rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 #ifdef VCONS_DRAW_INTR
        scr->scr_flags |= VCONS_DONT_READ;
diff -r 545a7dd18b57 -r c608a10a8a46 sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c    Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/dev/pci/radeonfb.c    Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeonfb.c,v 1.51 2012/01/05 21:40:03 macallan Exp $ */
+/*     $NetBSD: radeonfb.c,v 1.52 2012/01/11 16:02:30 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.51 2012/01/05 21:40:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.52 2012/01/11 16:02:30 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2192,7 +2192,7 @@
         */
 
        /* initialize and look for an initial font */
-       rasops_init(ri, dp->rd_virty/8, dp->rd_virtx/8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
        rasops_reconfig(ri, dp->rd_virty / ri->ri_font->fontheight,
diff -r 545a7dd18b57 -r c608a10a8a46 sys/dev/pci/voodoofb.c
--- a/sys/dev/pci/voodoofb.c    Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/dev/pci/voodoofb.c    Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: voodoofb.c,v 1.28 2011/10/08 00:22:25 kiyohara Exp $   */
+/*     $NetBSD: voodoofb.c,v 1.29 2012/01/11 16:02:30 macallan Exp $   */
 
 /*
  * Copyright (c) 2005, 2006 Michael Lorenz
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.28 2011/10/08 00:22:25 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.29 2012/01/11 16:02:30 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1048,7 +1048,7 @@
                ri->ri_flg |= RI_CLEAR;
        }
        
-       rasops_init(ri, sc->height/8, sc->width/8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
        rasops_reconfig(ri, sc->height / ri->ri_font->fontheight,
diff -r 545a7dd18b57 -r c608a10a8a46 sys/dev/pci/wcfb.c
--- a/sys/dev/pci/wcfb.c        Wed Jan 11 15:52:32 2012 +0000
+++ b/sys/dev/pci/wcfb.c        Wed Jan 11 15:53:32 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wcfb.c,v 1.8 2011/01/22 15:14:28 cegger Exp $ */
+/*     $NetBSD: wcfb.c,v 1.9 2012/01/11 16:02:30 macallan Exp $ */
 
 /*-
  * Copyright (c) 2010 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.8 2011/01/22 15:14:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wcfb.c,v 1.9 2012/01/11 16:02:30 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -379,7 +379,7 @@
                ri->ri_flg |= RI_CLEAR;
        }
 
-       rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
+       rasops_init(ri, 0, 0);
        ri->ri_caps = WSSCREEN_WSCOLORS;
 
        rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,



Home | Main Index | Thread Index | Old Index