Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Update configuration to match `rasops' fixes and co...
details: https://anonhg.NetBSD.org/src/rev/65fa63f40dbd
branches: trunk
changeset: 472250:65fa63f40dbd
user: ad <ad%NetBSD.org@localhost>
date: Mon Apr 26 04:25:38 1999 +0000
description:
Update configuration to match `rasops' fixes and config glue.
diffstat:
sys/arch/sparc/conf/BILL-THE-CAT | 7 +++----
sys/arch/sparc/conf/GENERIC | 7 +++----
sys/arch/sparc/conf/INSTALL | 7 +++----
sys/arch/sparc/conf/files.sparc | 22 ++++++++++++----------
sys/arch/sparc/dev/fb.c | 24 +++++-------------------
sys/arch/sparc64/conf/GENERIC | 5 +----
sys/arch/sparc64/conf/GENERIC64 | 7 +++----
sys/arch/sparc64/conf/NONPLUS | 7 +++----
sys/arch/sparc64/conf/NONPLUS64 | 7 +++----
sys/arch/sparc64/dev/fb.c | 25 +++++--------------------
10 files changed, 41 insertions(+), 77 deletions(-)
diffs (truncated from 350 to 300 lines):
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc/conf/BILL-THE-CAT
--- a/sys/arch/sparc/conf/BILL-THE-CAT Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc/conf/BILL-THE-CAT Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BILL-THE-CAT,v 1.3 1999/04/13 18:45:40 ad Exp $
+# $NetBSD: BILL-THE-CAT,v 1.4 1999/04/26 04:25:38 ad Exp $
# From: GENERIC,v 1.76 1999/01/17 20:45:26 pk Exp
include "arch/sparc/conf/std.sparc"
@@ -24,9 +24,8 @@
## Use a faster console than the PROM's slow drawing routines. Not needed
## for headless (no framebuffer) machines.
#options RASTERCONSOLE # fast rasterop console
-#options RASOPS1 # 1-bit operations (XXX)
-#options RASOPS8 # 8-bit operations (XXX)
-#options FONT_LUCIDA16x29 # the console font
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc/conf/GENERIC
--- a/sys/arch/sparc/conf/GENERIC Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc/conf/GENERIC Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.78 1999/04/14 09:48:37 pk Exp $
+# $NetBSD: GENERIC,v 1.79 1999/04/26 04:25:38 ad Exp $
include "arch/sparc/conf/std.sparc"
@@ -23,9 +23,8 @@
## Use a faster console than the PROM's slow drawing routines. Not needed
## for headless (no framebuffer) machines.
options RASTERCONSOLE # fast rasterop console
-options RASOPS1 # 1-bit operations (XXX)
-options RASOPS8 # 8-bit operations (XXX)
-options FONT_LUCIDA16x29 # the console font
+options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc/conf/INSTALL
--- a/sys/arch/sparc/conf/INSTALL Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc/conf/INSTALL Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.5 1999/04/13 18:45:41 ad Exp $
+# $NetBSD: INSTALL,v 1.6 1999/04/26 04:25:38 ad Exp $
#
# from: NetBSD: GENERIC,v 1.67 1998/05/20 11:50:54 pk Exp
#
@@ -37,9 +37,8 @@
## Use a faster console than the PROM's slow drawing routines. Not needed
## for headless (no framebuffer) machines.
#options RASTERCONSOLE # fast rasterop console
-#options RASOPS1 # 1-bit operations (XXX)
-#options RASOPS8 # 8-bit operations (XXX)
-#options FONT_LUCIDA16x29 # the console font
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc/conf/files.sparc
--- a/sys/arch/sparc/conf/files.sparc Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc/conf/files.sparc Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.72 1999/04/17 21:26:59 kleink Exp $
+# $NetBSD: files.sparc,v 1.73 1999/04/26 04:25:38 ad Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -137,43 +137,46 @@
# Brooktree DAC attribute
define bt_dac
+# Raster operations for RASTERCONSOLE (this is here so dependancies work).
+include "dev/rasops/files.rasops"
+
# Include /dev/fb driver only if a framebuffer card is included
define fb
-device bwtwo: fb
+device bwtwo: fb, rasops1
attach bwtwo at sbus with bwtwo_sbus
attach bwtwo at obio with bwtwo_obio
file arch/sparc/dev/bwtwo.c bwtwo needs-flag
-device cgtwo: fb
+device cgtwo: fb, rasops8
attach cgtwo at vme
file arch/sparc/dev/cgtwo.c cgtwo needs-flag
-device cgthree: bt_dac, fb
+device cgthree: bt_dac, fb, rasops8
attach cgthree at sbus with cgthree_sbus
attach cgthree at obio with cgthree_obio
file arch/sparc/dev/cgthree.c cgthree needs-flag
-device cgfour: bt_dac, fb
+device cgfour: bt_dac, fb, rasops8
attach cgfour at obio
file arch/sparc/dev/cgfour.c cgfour needs-flag
-device cgsix: bt_dac, fb
+device cgsix: bt_dac, fb, rasops8
attach cgsix at sbus with cgsix_sbus
attach cgsix at obio with cgsix_obio
file arch/sparc/dev/cgsix.c cgsix needs-flag
file arch/sparc/dev/cgsix_sbus.c cgsix_sbus & (sbus | obio)
file arch/sparc/dev/cgsix_obio.c cgsix_obio & obio
-device cgeight: bt_dac, fb
+device cgeight: bt_dac, fb, rasops24
attach cgeight at obio
file arch/sparc/dev/cgeight.c cgeight needs-flag
-device tcx: bt_dac, fb
+device tcx: bt_dac, fb, rasops8, rasops24
attach tcx at sbus
file arch/sparc/dev/tcx.c tcx needs-flag
-device cgfourteen: fb
+device cgfourteen: fb, rasops32
attach cgfourteen at obio
file arch/sparc/dev/cgfourteen.c cgfourteen needs-flag
@@ -244,7 +247,6 @@
# Raster Console
#
include "dev/rcons/files.rcons"
-include "dev/rasops/files.rasops"
include "dev/wsfont/files.wsfont"
#
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc/dev/fb.c
--- a/sys/arch/sparc/dev/fb.c Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc/dev/fb.c Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.26 1999/04/13 19:02:38 ad Exp $ */
+/* $NetBSD: fb.c,v 1.27 1999/04/26 04:25:38 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -64,7 +64,6 @@
#include <sparc/dev/pfourreg.h>
#include <dev/rasops/rasops.h>
-#include <dev/wsfont/wsfont.h>
static struct fbdevice *devfb;
@@ -341,7 +340,7 @@
static void fb_bell __P((int));
-#if !(defined(RASTERCONS_FULLSCREEN) || defined(RASTERCONS_SMALLFONT))
+#if defined(RASTERCONS_FULLSCREEN)
static int a2int __P((char *, int));
static int
@@ -372,7 +371,7 @@
{
struct rconsole *rc = &fb->fb_rcons;
struct rasops_info *ri = &fb->fb_rinfo;
- int maxrow, maxcol, cookie;
+ int maxrow, maxcol;
/* Set up what rasops needs to know about */
ri->ri_stride = fb->fb_linebytes;
@@ -385,20 +384,7 @@
maxrow = 0;
maxcol = 0;
- /* Pick our default font. There is always a fallback */
- wsfont_init();
-
- /* XXX leave font init to rasops until rasops1 is fixed */
- if (ri->ri_depth != 1)
-#ifdef RASTERCONS_SMALLFONT
- if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
-#else
- if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
-#endif
- wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE,
- WSFONT_LITTLE);
-
-#if !defined(RASTERCONS_FULLSCREEN) && !defined(RASTERCONS_SMALLFONT)
+#if !defined(RASTERCONS_FULLSCREEN)
#if defined(SUN4)
if (CPU_ISSUN4) {
struct eeprom *eep = (struct eeprom *)eeprom_va;
@@ -418,7 +404,7 @@
maxrow =
a2int(getpropstring(optionsnode, "screen-#rows"), 34);
}
-#endif /* !RASTERCONS_FULLSCREEN && !RASTERCONS_SMALLFONT */
+#endif /* !RASTERCONS_FULLSCREEN */
/*
* XXX until somebody actually sets the colormap after a call to
* rasops_init() with ri->ri_cmap, we can only do mono..
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc64/conf/GENERIC Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.14 1999/04/13 18:45:41 ad Exp $
+# $NetBSD: GENERIC,v 1.15 1999/04/26 04:25:38 ad Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -20,9 +20,6 @@
## for headless (no framebuffer) machines.
# XXX broken on sparc64
#options RASTERCONSOLE # fast rasterop console
-#options RASOPS1 # 1-bit operations (XXX)
-#options RASOPS8 # 8-bit operations (XXX)
-#options FONT_LUCIDA16x29 # the console font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc64/conf/GENERIC64
--- a/sys/arch/sparc64/conf/GENERIC64 Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc64/conf/GENERIC64 Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.4 1999/04/13 18:45:42 ad Exp $
+# $NetBSD: GENERIC64,v 1.5 1999/04/26 04:25:38 ad Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -20,9 +20,8 @@
## for headless (no framebuffer) machines.
# XXX broken on sparc64
#options RASTERCONSOLE # fast rasterop console
-#options RASOPS1 # 1-bit operations (XXX)
-#options RASOPS8 # 8-bit operations (XXX)
-#options FONT_LUCIDA16x29 # the console font
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS,v 1.11 1999/04/13 18:45:42 ad Exp $
+# $NetBSD: NONPLUS,v 1.12 1999/04/26 04:25:38 ad Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -20,9 +20,8 @@
## Use a faster console than the PROM's slow drawing routines. Not needed
## for headless (no framebuffer) machines.
#options RASTERCONSOLE # fast rasterop console
-#options RASOPS1 # 1-bit operations (XXX)
-#options RASOPS8 # 8-bit operations (XXX)
-#options FONT_LUCIDA16x29 # the console font
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc64/conf/NONPLUS64
--- a/sys/arch/sparc64/conf/NONPLUS64 Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS64 Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS64,v 1.7 1999/04/13 18:45:42 ad Exp $
+# $NetBSD: NONPLUS64,v 1.8 1999/04/26 04:25:38 ad Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -19,9 +19,8 @@
## Use a faster console than the PROM's slow drawing routines. Not needed
## for headless (no framebuffer) machines.
#options RASTERCONSOLE # fast rasterop console
-#options RASOPS1 # 1-bit operations (XXX)
-#options RASOPS8 # 8-bit operations (XXX)
-#options FONT_LUCIDA16x29 # the console font
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
diff -r 3d4080914f43 -r 65fa63f40dbd sys/arch/sparc64/dev/fb.c
--- a/sys/arch/sparc64/dev/fb.c Mon Apr 26 04:24:22 1999 +0000
+++ b/sys/arch/sparc64/dev/fb.c Mon Apr 26 04:25:38 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.5 1999/04/13 19:02:38 ad Exp $ */
+/* $NetBSD: fb.c,v 1.6 1999/04/26 04:25:39 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -63,8 +63,6 @@
#include <machine/eeprom.h>
#include <sparc64/dev/pfourreg.h>
-#include <dev/wsfont/wsfont.h>
-
static struct fbdevice *devfb;
Home |
Main Index |
Thread Index |
Old Index