Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax Adjust to use <dev/sun/fbio.h>
details: https://anonhg.NetBSD.org/src/rev/d73a6d29ba52
branches: trunk
changeset: 515233:d73a6d29ba52
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed Sep 19 19:04:16 2001 +0000
description:
Adjust to use <dev/sun/fbio.h>
diffstat:
sys/arch/pmax/dev/bt459.c | 8 ++++----
sys/arch/pmax/dev/bt478.c | 4 ++--
sys/arch/pmax/dev/cfb.c | 6 +++---
sys/arch/pmax/dev/dtop.c | 6 +++---
sys/arch/pmax/dev/fb.c | 4 ++--
sys/arch/pmax/dev/ims332.c | 6 +++---
sys/arch/pmax/dev/mfb.c | 8 ++++----
sys/arch/pmax/dev/pm.c | 10 +++++-----
sys/arch/pmax/dev/px.c | 8 ++++----
sys/arch/pmax/dev/qvss_compat.c | 4 ++--
sys/arch/pmax/dev/rcons.c | 8 ++++----
sys/arch/pmax/dev/sfb.c | 6 +++---
sys/arch/pmax/dev/xcfb.c | 6 +++---
sys/arch/pmax/tc/tcbus.c | 6 +++---
14 files changed, 45 insertions(+), 45 deletions(-)
diffs (truncated from 403 to 300 lines):
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/bt459.c
--- a/sys/arch/pmax/dev/bt459.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/bt459.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bt459.c,v 1.21 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: bt459.c,v 1.22 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bt459.c,v 1.21 2001/07/07 14:21:00 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt459.c,v 1.22 2001/09/19 19:04:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@
#include <machine/pmioctl.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <pmax/dev/fbreg.h>
#include <pmax/dev/bt459.h> /* chipset definitions */
@@ -384,7 +384,7 @@
fbu->scrInfo.cursor.y = y; /* position, indep. of mouse */
/* XXX is this a linear function of x-dimension screen size? */
- if (fi->fi_type.fb_boardtype == PMAX_FBTYPE_SFB) {
+ if (fi->fi_type.fb_type == PMAX_FBTYPE_SFB) {
x += fi->fi_type.fb_width == 1280 ? 368 : 220;
y += fi->fi_type.fb_height == 1024 ? 38 : 35;
} else {
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/bt478.c
--- a/sys/arch/pmax/dev/bt478.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/bt478.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bt478.c,v 1.16 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: bt478.c,v 1.17 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -62,7 +62,7 @@
#include <machine/bus.h> /* wbflush() */
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <pmax/dev/bt478.h> /* chipset definitions */
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/cfb.c
--- a/sys/arch/pmax/dev/cfb.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/cfb.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.39 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: cfb.c,v 1.40 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -88,7 +88,7 @@
#include <machine/autoconf.h>
#include <machine/pmioctl.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <pmax/dev/bt459.h>
#include <pmax/dev/cfbvar.h>
@@ -238,7 +238,7 @@
fi->fi_blanked = 0;
/* Fill in Frame Buffer Type struct. */
- fi->fi_type.fb_boardtype = PMAX_FBTYPE_CFB;
+ fi->fi_type.fb_type = PMAX_FBTYPE_CFB;
fi->fi_type.fb_width = 1024;
fi->fi_type.fb_height = 864;
fi->fi_type.fb_depth = 8;
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/dtop.c
--- a/sys/arch/pmax/dev/dtop.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/dtop.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dtop.c,v 1.56 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: dtop.c,v 1.57 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -94,7 +94,7 @@
********************************************************/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.56 2001/07/07 14:21:00 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.57 2001/09/19 19:04:16 thorpej Exp $");
#include "opt_ddb.h"
#include "rasterconsole.h"
@@ -118,7 +118,7 @@
#include <machine/dc7085cons.h> /* mdmctl bits same on dtop and dc? */
#include <machine/pmioctl.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <pmax/dev/dtopreg.h>
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/fb.c
--- a/sys/arch/pmax/dev/fb.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/fb.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.35 2000/02/03 04:20:00 nisimura Exp $ */
+/* $NetBSD: fb.c,v 1.36 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -70,7 +70,7 @@
#include <sys/conf.h>
#include <machine/conf.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <machine/pmioctl.h>
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/ims332.c
--- a/sys/arch/pmax/dev/ims332.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/ims332.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ims332.c,v 1.13 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: ims332.c,v 1.14 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993, 1995
@@ -40,13 +40,13 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ims332.c,v 1.13 2001/07/07 14:21:00 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ims332.c,v 1.14 2001/09/19 19:04:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <pmax/dev/ims332.h>
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/mfb.c
--- a/sys/arch/pmax/dev/mfb.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/mfb.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.46 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: mfb.c,v 1.47 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.46 2001/07/07 14:21:00 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.47 2001/09/19 19:04:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -91,7 +91,7 @@
#include <machine/autoconf.h>
#include <machine/pmioctl.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <pmax/dev/mfbreg.h>
@@ -281,7 +281,7 @@
fi->fi_blanked = 0;
/* Fill in Frame Buffer Type struct. */
- fi->fi_type.fb_boardtype = PMAX_FBTYPE_MFB;
+ fi->fi_type.fb_type = PMAX_FBTYPE_MFB;
fi->fi_type.fb_width = 1280; /* visible screen pixels */
fi->fi_type.fb_height = 1024;
fi->fi_type.fb_depth = 8;
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/pm.c
--- a/sys/arch/pmax/dev/pm.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/pm.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pm.c,v 1.34 2000/11/02 23:37:08 mhitch Exp $ */
+/* $NetBSD: pm.c,v 1.35 2001/09/19 19:04:16 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.34 2000/11/02 23:37:08 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.35 2001/09/19 19:04:16 thorpej Exp $");
#include <sys/param.h>
@@ -68,7 +68,7 @@
#include <pmax/pmax/kn01.h>
#include <pmax/ibus/ibusvar.h>
#include <machine/autoconf.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <machine/locore.h> /* wbflush() */
#include <machine/pmioctl.h>
@@ -202,7 +202,7 @@
fi->fi_vdac = (caddr_t)MIPS_PHYS_TO_KSEG1(KN01_SYS_VDAC);
if (kn01csr & KN01_CSR_MONO) {
- fi->fi_type.fb_boardtype = PMAX_FBTYPE_PM_MONO;
+ fi->fi_type.fb_type = PMAX_FBTYPE_PM_MONO;
fi->fi_type.fb_depth = 1;
fi->fi_type.fb_cmsize = 0;
fi->fi_type.fb_size = 0x40000;
@@ -210,7 +210,7 @@
fi->fi_linebytes = 2048 / 8;
}
else {
- fi->fi_type.fb_boardtype = PMAX_FBTYPE_PM_COLOR;
+ fi->fi_type.fb_type = PMAX_FBTYPE_PM_COLOR;
fi->fi_type.fb_depth = 8;
fi->fi_type.fb_cmsize = 256;
fi->fi_type.fb_size = 0x100000;
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/px.c
--- a/sys/arch/pmax/dev/px.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/px.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.36 2001/09/18 18:15:51 wiz Exp $ */
+/* $NetBSD: px.c,v 1.37 2001/09/19 19:04:17 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.36 2001/09/18 18:15:51 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.37 2001/09/19 19:04:17 thorpej Exp $");
/*
* px.c: driver for the DEC TURBOchannel 2D and 3D accelerated framebuffers
@@ -81,7 +81,7 @@
#include <machine/autoconf.h>
#include <machine/conf.h>
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <machine/pmioctl.h>
@@ -461,7 +461,7 @@
fi->fi_fbu = &pxi->pxi_fbuaccess;
fi->fi_type.fb_width = 1280;
fi->fi_type.fb_height = 1024;
- fi->fi_type.fb_boardtype = PMAX_FBTYPE_PX;
+ fi->fi_type.fb_type = PMAX_FBTYPE_PX;
fi->fi_type.fb_cmsize = 256;
fi->fi_type.fb_depth = 8;
fi->fi_fbu->scrInfo.max_row = 1024 / 8;
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/qvss_compat.c
--- a/sys/arch/pmax/dev/qvss_compat.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/qvss_compat.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: qvss_compat.c,v 1.27 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: qvss_compat.c,v 1.28 2001/09/19 19:04:17 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
#include <dev/dec/lk201.h> /* LK-201 keycodes */
-#include <machine/fbio.h>
+#include <dev/sun/fbio.h>
#include <machine/fbvar.h>
#include <machine/pmioctl.h> /* X11R5 Xserver ioctls */
diff -r 6eac4e6651d4 -r d73a6d29ba52 sys/arch/pmax/dev/rcons.c
--- a/sys/arch/pmax/dev/rcons.c Wed Sep 19 18:51:03 2001 +0000
+++ b/sys/arch/pmax/dev/rcons.c Wed Sep 19 19:04:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons.c,v 1.50 2001/07/07 14:21:00 simonb Exp $ */
+/* $NetBSD: rcons.c,v 1.51 2001/09/19 19:04:17 thorpej Exp $ */
/*
* Copyright (c) 1995
@@ -53,7 +53,7 @@
#include <dev/rasops/rasops.h>
#include <dev/rcons/rcons.h>
-#include <machine/fbio.h>
Home |
Main Index |
Thread Index |
Old Index