Module Name: src
Committed By: macallan
Date: Wed Jan 11 16:02:30 UTC 2012
Modified Files:
src/sys/dev/pci: machfb.c pm2fb.c r128fb.c radeonfb.c voodoofb.c wcfb.c
Log Message:
use rasops_init(0, 0)
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/wcfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.71 src/sys/dev/pci/machfb.c:1.72
--- src/sys/dev/pci/machfb.c:1.71 Thu Aug 4 00:57:33 2011
+++ src/sys/dev/pci/machfb.c Wed Jan 11 16:02:29 2012
@@ -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 @@ mach64_init_screen(void *cookie, struct
}
}
- 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);
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.10 src/sys/dev/pci/pm2fb.c:1.11
--- src/sys/dev/pci/pm2fb.c:1.10 Thu Nov 24 05:57:17 2011
+++ src/sys/dev/pci/pm2fb.c Wed Jan 11 16:02:30 2012
@@ -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 @@ pm2fb_attach(device_t parent, device_t s
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 @@ pm2fb_init_screen(void *cookie, struct v
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,
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.26 src/sys/dev/pci/r128fb.c:1.27
--- src/sys/dev/pci/r128fb.c:1.26 Wed Jan 4 15:56:18 2012
+++ src/sys/dev/pci/r128fb.c Wed Jan 11 16:02:29 2012
@@ -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 @@ r128fb_init_screen(void *cookie, struct
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;
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.51 src/sys/dev/pci/radeonfb.c:1.52
--- src/sys/dev/pci/radeonfb.c:1.51 Thu Jan 5 21:40:03 2012
+++ src/sys/dev/pci/radeonfb.c Wed Jan 11 16:02:30 2012
@@ -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 @@ radeonfb_init_screen(void *cookie, struc
*/
/* 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,
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.28 src/sys/dev/pci/voodoofb.c:1.29
--- src/sys/dev/pci/voodoofb.c:1.28 Sat Oct 8 00:22:25 2011
+++ src/sys/dev/pci/voodoofb.c Wed Jan 11 16:02:30 2012
@@ -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 @@ voodoofb_init_screen(void *cookie, struc
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,
Index: src/sys/dev/pci/wcfb.c
diff -u src/sys/dev/pci/wcfb.c:1.8 src/sys/dev/pci/wcfb.c:1.9
--- src/sys/dev/pci/wcfb.c:1.8 Sat Jan 22 15:14:28 2011
+++ src/sys/dev/pci/wcfb.c Wed Jan 11 16:02:30 2012
@@ -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 @@ wcfb_init_screen(void *cookie, struct vc
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,
