Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configuration glue needed by rasops, wsfont, rcons and the px driver.

This commit is contained in:
ad 1999-04-13 18:53:27 +00:00
parent cf19d10b2a
commit 0993fa2727
9 changed files with 119 additions and 2102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/pmax/conf/DSG
View File

@ -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_10 # NetBSD 1.0, (needed for X on 386?)
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

9
sys/arch/pmax/conf/GENERIC
View File

@ -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 IPFILTER_LOG # ipmon(8) log support
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

10
sys/arch/pmax/conf/INSTALL
View File

@ -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 "TCP_COMPAT_42" # compatibility with 4.2BSD TCP/IP
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

9
sys/arch/pmax/conf/R4000
View File

@ -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 GATEWAY # IP packet forwarding
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

12
sys/arch/pmax/conf/files.pmax
View File

@ -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 @@ attach xcfb at tc
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 @@ file arch/pmax/dev/findcons.c # find and set up console.
# 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

75
sys/arch/pmax/dev/font.c
View File

@ -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;
}

1976
sys/arch/pmax/dev/qvss.h
View File

File diff suppressed because it is too large Load Diff

111
sys/arch/pmax/dev/rcons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcons.c,v 1.21 1999/01/28 10:35:53 jonathan Exp $ */
/* $NetBSD: rcons.c,v 1.22 1999/04/13 18:53:30 ad Exp $ */
/*
* Copyright (c) 1995
@ -66,9 +66,9 @@
#include <sys/device.h>
#include <machine/fbio.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rcons/rcons.h>
#include <dev/rcons/rcons_subr.h>
#include <dev/rcons/raster.h>
#include <dev/rasops/rasops.h>
#include <machine/fbvar.h>
#include <machine/pmioctl.h>
@ -76,7 +76,6 @@
#include <pmax/dev/lk201var.h>
/*
* Console I/O is redirected to the appropriate device, either a screen and
* keyboard, a serial port, or the "virtual" console.
@ -91,11 +90,11 @@ dev_t cn_in_dev = NODEV; /* console input device. */
char rcons_maxcols [20];
void rcons_connect __P((struct fbinfo *info));
static struct rconsole rc;
void rasterconsoleattach __P((int n));
void rcons_vputc __P ((dev_t dev, int c));
void rconsreset __P((struct tty *tp, int rw));
void rcons_input __P((dev_t dev, int ic));
@ -113,8 +112,25 @@ void
rcons_connect (info)
struct fbinfo *info;
{
static struct rconsole rc;
static int row, col;
static struct rasops_info ri;
/* TC mfb has special needs; 8-bits per pel, but monochrome */
if (info->fi_type.fb_boardtype == PMAX_FBTYPE_MFB) {
ri.ri_depth = 8;
ri.ri_forcemono = 1;
} else
ri.ri_depth = info->fi_type.fb_depth;
ri.ri_width = info->fi_type.fb_width;
ri.ri_height = info->fi_type.fb_height;
ri.ri_stride = info->fi_linebytes;
ri.ri_bits = (u_char *)info->fi_pixels;
/* Get operations set and set framebugger colormap */
rasops_init(&ri, 0, 80, 1, 0);
if (ri.ri_depth == 8 && info->fi_type.fb_boardtype != PMAX_FBTYPE_MFB)
info->fi_driver->fbd_putcmap(info, rasops_cmap, 0, 256);
fbconstty = &rcons_tty [0];
fbconstty->t_dev = makedev(85, 0); /* /dev/console */
@ -126,43 +142,52 @@ rcons_connect (info)
* the part that rcons.h says
* "This section must be filled in by the framebugger device"
*/
rc.rc_width = info->fi_type.fb_width;
rc.rc_height = info->fi_type.fb_height;
rc.rc_depth = info->fi_type.fb_depth;
rc.rc_pixels =info->fi_pixels;
rc.rc_linebytes = info->fi_linebytes;
#define HW_FONT_WIDTH 8
#define HW_FONT_HEIGHT 15
rc.rc_maxrow = rc.rc_height / HW_FONT_HEIGHT;
rc.rc_maxcol = 80;
rc.rc_ops = &ri.ri_ops;
rc.rc_cookie = &ri;
rc.rc_maxrow = ri.ri_rows;
rc.rc_maxcol = ri.ri_cols;
rc.rc_bell = lk_bell;
/* Initialize the state information. */
rc.rc_bits = 0;
rc.rc_ringing = 0;
rc.rc_belldepth = 0;
rc.rc_scroll = 0;
rc.rc_p0 = 0;
rc.rc_p1 = 0;
/* The following two items may optionally be left zero */
rc.rc_row = &row;
rc.rc_col = &col;
/* Initialize the rastercons font to something suitable for a qvss */
rcons_font(&rc);
row = (rc.rc_height / HW_FONT_HEIGHT) - 1;
col = 0;
rcons_init (&rc);
rc.rc_xorigin = 0;
rc.rc_yorigin = 0;
rc.rc_width = ri.ri_width;
rc.rc_height = ri.ri_height;
rcons_init(&rc);
}
/*
* Called by drivers which can provide a native 'struct wsdisplay_emulops'.
*/
void
rcons_connect_native (ops, cookie, width, height, cols, rows)
struct wsdisplay_emulops *ops;
void *cookie;
int width, height, cols, rows;
{
extern dev_t cn_in_dev; /* XXX rcons hackery */
/* Do we really need this? - ad */
/*XXX*/ cn_in_dev = cn_tab->cn_dev; /*XXX*/ /* FIXME */
fbconstty = &rcons_tty [0];
fbconstty->t_dev = makedev(85, 0); /* /dev/console */
fbconstty->t_ispeed = fbconstty->t_ospeed = TTYDEF_SPEED;
fbconstty->t_param = (int (*)(struct tty *, struct termios *))nullop;
/*
* Connect the console geometry...
* the part that rcons.h says
* "This section must be filled in by the framebugger device"
*/
rc.rc_ops = ops;
rc.rc_cookie = cookie;
rc.rc_bell = lk_bell;
rc.rc_width = width;
rc.rc_height = width;
rc.rc_maxcol = cols;
rc.rc_maxrow = rows;
rcons_init(&rc);
}
/*
* Hack around the rcons putchar interface not taking a dev_t.
*/
@ -460,7 +485,7 @@ rcons_input (dev, ic)
int unit = minor (dev);
#ifdef RCONS_DEBUG
printf("rcons_input: unit %d gives %c on \n", unit, ic);
printf("rcons_input: dev %d.%d gives %c on \n", major(dev), unit, ic);
#endif
if (unit > NRASTERCONSOLE)

10
sys/arch/pmax/dev/rconsvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rconsvar.h,v 1.2 1998/03/24 09:51:23 jonathan Exp $ */
/* $NetBSD: rconsvar.h,v 1.3 1999/04/13 18:53:30 ad Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@ -36,9 +36,17 @@
#ifdef _KERNEL
#define RCONSDEV 85
struct wsdisplay_emulops;
struct consdev;
struct fbinfo;
extern void rcons_connect __P((struct fbinfo *));
extern void rcons_connect_native __P ((struct wsdisplay_emulops *, void *,
int, int, int, int));
extern void rcons_indev __P((struct consdev *));
extern void rcons_vputc __P((dev_t, int)); /* XXX */
extern void rcons_input __P((dev_t, int ic)); /*XXX*/
#endif /* _KERNEL */
#endif /* _MACHINE_RCONS_H_ */