Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax Add configuration glue needed by rasops, wsfon...
details: https://anonhg.NetBSD.org/src/rev/69193f568a81
branches: trunk
changeset: 471859:69193f568a81
user: ad <ad%NetBSD.org@localhost>
date: Tue Apr 13 18:53:27 1999 +0000
description:
Add configuration glue needed by rasops, wsfont, rcons and the px driver.
diffstat:
sys/arch/pmax/conf/DSG | 9 +-
sys/arch/pmax/conf/GENERIC | 9 +-
sys/arch/pmax/conf/INSTALL | 10 +-
sys/arch/pmax/conf/R4000 | 9 +-
sys/arch/pmax/conf/files.pmax | 12 +-
sys/arch/pmax/dev/font.c | 75 -
sys/arch/pmax/dev/qvss.h | 1976 -----------------------------------------
sys/arch/pmax/dev/rcons.c | 101 +-
sys/arch/pmax/dev/rconsvar.h | 10 +-
9 files changed, 114 insertions(+), 2097 deletions(-)
diffs (truncated from 2386 to 300 lines):
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/conf/DSG
--- a/sys/arch/pmax/conf/DSG Tue Apr 13 18:50:51 1999 +0000
+++ b/sys/arch/pmax/conf/DSG Tue Apr 13 18:53:27 1999 +0000
@@ -1,7 +1,7 @@
#
# Stanford DSG Decstation (any model) kernel config file
#
-# $NetBSD: DSG,v 1.16 1999/02/07 07:14:21 jonathan Exp $
+# $NetBSD: DSG,v 1.17 1999/04/13 18:53:27 ad Exp $
#
include "arch/pmax/conf/std.pmax"
@@ -71,6 +71,13 @@
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # Netbsd 1.2 reboot()
+# Raster console options
+options RASOPS1 # 1-bit framebuffer ops (XXX)
+options RASOPS8 # 8-bit framebuffer ops (XXX)
+options FONT_BOLD8x16 # Font for fb devices
+options FONT_LUCIDA16x29 # Font for px devices
+#options RASTERCONSOLE_FGCOL=WSCOL_GREEN
+#options RASTERCONSOLE_BGCOL=WSCOL_BLACK
# pmax specific
options COMPAT_ULTRIX # ultrix compatibility
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/conf/GENERIC
--- a/sys/arch/pmax/conf/GENERIC Tue Apr 13 18:50:51 1999 +0000
+++ b/sys/arch/pmax/conf/GENERIC Tue Apr 13 18:53:27 1999 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.39 1999/03/29 05:56:29 nisimura Exp $
+# $NetBSD: GENERIC,v 1.40 1999/04/13 18:53:28 ad Exp $
#
# Distribution kernel (any model) kernel config file
#
@@ -84,6 +84,13 @@
options COMPAT_12 # Netbsd 1.2 reboot()
options COMPAT_13 # Netbsd 1.3
+# Raster console options
+options RASOPS1 # 1-bit framebuffer ops (XXX)
+options RASOPS8 # 8-bit framebuffer ops (XXX)
+options FONT_BOLD8x16 # Font for fb devices
+options FONT_LUCIDA16x29 # Font for px devices
+#options RASTERCONSOLE_FGCOL=WSCOL_GREEN
+#options RASTERCONSOLE_BGCOL=WSCOL_BLACK
# pmax specific
options COMPAT_ULTRIX # Ultrix compatibility
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/conf/INSTALL
--- a/sys/arch/pmax/conf/INSTALL Tue Apr 13 18:50:51 1999 +0000
+++ b/sys/arch/pmax/conf/INSTALL Tue Apr 13 18:53:27 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.18 1999/03/28 05:46:53 simonb Exp $
+# $NetBSD: INSTALL,v 1.19 1999/04/13 18:53:28 ad Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -60,6 +60,14 @@
options COMPAT_12
options COMPAT_13
+# Raster console options
+options RASOPS1 # 1-bit framebuffer ops (XXX)
+options RASOPS8 # 8-bit framebuffer ops (XXX)
+options FONT_BOLD8x16 # Font for fb devices
+options FONT_LUCIDA16x29 # Font for px devices
+#options RASTERCONSOLE_FGCOL=WSCOL_GREEN
+#options RASTERCONSOLE_BGCOL=WSCOL_BLACK
+
# pmax specific
options "HZ=256" # RTC rate required
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/conf/R4000
--- a/sys/arch/pmax/conf/R4000 Tue Apr 13 18:50:51 1999 +0000
+++ b/sys/arch/pmax/conf/R4000 Tue Apr 13 18:53:27 1999 +0000
@@ -2,7 +2,7 @@
# R4000 (any model) kernel config file
#
-# $NetBSD: R4000,v 1.13 1999/03/27 08:15:29 simonb Exp $
+# $NetBSD: R4000,v 1.14 1999/04/13 18:53:28 ad Exp $
#
include "arch/pmax/conf/std.pmax"
@@ -71,6 +71,13 @@
options COMPAT_12 # Netbsd 1.2 reboot()
options COMPAT_13 # Netbsd 1.3
+# Raster console options
+options RASOPS1 # 1-bit framebuffer ops (XXX)
+options RASOPS8 # 8-bit framebuffer ops (XXX)
+options FONT_BOLD8x16 # Font for fb devices
+options FONT_LUCIDA16x29 # Font for px devices
+#options RASTERCONSOLE_FGCOL=WSCOL_GREEN
+#options RASTERCONSOLE_BGCOL=WSCOL_BLACK
# pmax specific
options COMPAT_ULTRIX # ultrix compatibility
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/conf/files.pmax
--- a/sys/arch/pmax/conf/files.pmax Tue Apr 13 18:50:51 1999 +0000
+++ b/sys/arch/pmax/conf/files.pmax Tue Apr 13 18:53:27 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.61 1999/03/27 08:15:29 simonb Exp $
+# $NetBSD: files.pmax,v 1.62 1999/04/13 18:53:28 ad Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -215,6 +215,11 @@
file arch/pmax/dev/xcfb.c xcfb needs-flag
file arch/pmax/dev/ims332.c xcfb
+# PixelStamp graphics boards
+device px
+attach px at tc
+file arch/pmax/dev/px.c px needs-flag
+
# DECWRL 45Mbit T3 interface
device tt: tty
attach tt at tc
@@ -244,13 +249,14 @@
# pmax configuration glue for rconsole. Requires fb pseudo-device.
include "dev/rcons/files.rcons"
+include "dev/rasops/files.rasops"
+include "dev/wsfont/files.wsfont"
pseudo-device rasterconsole
file arch/pmax/dev/rcons.c rasterconsole needs-flag
-file arch/pmax/dev/font.c rasterconsole # rcons fontdef
## Support code for LK-201 keyboards, mice, and qvss ring buffers
-file arch/pmax/dev/lk201.c pm | cfb | sfb | mfb | xcfb
+file arch/pmax/dev/lk201.c pm | cfb | sfb | mfb | xcfb | px
file arch/pmax/dev/qvss_compat.c fb
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/dev/font.c
--- a/sys/arch/pmax/dev/font.c Tue Apr 13 18:50:51 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/* $NetBSD: font.c,v 1.8 1996/04/07 19:53:36 jonathan Exp $ */
-
-/*
- * Copyright (c) 1991, 1993, 1995
- * The Regents of the University of California. All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Lawrence Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)rcons_font.c 8.1 (Berkeley) 6/11/93
- */
-
-#ifdef _KERNEL
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-#include <machine/fbio.h>
-#include <machine/fbvar.h>
-#else
-#include <sys/types.h>
-#include "myfbdevice.h"
-#endif
-
-#include <dev/rcons/rcons.h>
-#include <dev/rcons/raster.h>
-
-#include <pmax/dev/qvss.h> /* Little-endian font for rcons */
-
-void rcons_font __P((struct rconsole *rc));
-
-void
-rcons_font(rc)
- register struct rconsole *rc;
-{
-
- /* XXX really rather get this from the prom */
- rc->rc_font = &qvss;
-
- /* Get distance to top and bottom of font from font origin */
- rc->rc_font->ascent = -(rc->rc_font->chars)['a'].homey;
-}
diff -r b98f13584e29 -r 69193f568a81 sys/arch/pmax/dev/qvss.h
--- a/sys/arch/pmax/dev/qvss.h Tue Apr 13 18:50:51 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1976 +0,0 @@
-/* $NetBSD: qvss.h,v 1.4 1996/04/07 19:54:37 jonathan Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)font.c 8.1 (Berkeley) 6/10/93
- *
- * font.c --
- *
- * The font table for the pmax.
- *
- * Copyright (C) 1989 Digital Equipment Corporation.
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies.
- * Digital Equipment Corporation makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- */
-
-/*
- * QVSS font table of displayable characters.
- */
-static u_int32_t qvss_32_pixels [] = {
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- 0x00, /* 0x00000000 */
- };
-static struct raster qvss_32 = { 8, 15, 1, 1, qvss_32_pixels, 0 };
-
-static u_int32_t qvss_33_pixels [] = {
- 0x00, /* 0x00000000 ! */
- 0x00, /* 0x00000000 ! */
- 0x08, /* 0x00001000 ! */
- 0x08, /* 0x00001000 ! */
Home |
Main Index |
Thread Index |
Old Index