From b83c8638398cac9715567134f6e1554d7af2e0e8 Mon Sep 17 00:00:00 2001 From: ad Date: Mon, 26 Apr 1999 04:30:26 +0000 Subject: [PATCH] Fixed to match rasops config glue. --- sys/arch/pmax/conf/DSG | 8 +++----- sys/arch/pmax/conf/GENERIC | 8 +++----- sys/arch/pmax/conf/INSTALL | 8 +++----- sys/arch/pmax/conf/R4000 | 8 +++----- sys/arch/pmax/conf/files.pmax | 16 +++++++++------- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/sys/arch/pmax/conf/DSG b/sys/arch/pmax/conf/DSG index 9929b7468c12..3667889e5c8b 100644 --- a/sys/arch/pmax/conf/DSG +++ b/sys/arch/pmax/conf/DSG @@ -1,7 +1,7 @@ # # Stanford DSG Decstation (any model) kernel config file # -# $NetBSD: DSG,v 1.17 1999/04/13 18:53:27 ad Exp $ +# $NetBSD: DSG,v 1.18 1999/04/26 04:30:26 ad Exp $ # include "arch/pmax/conf/std.pmax" @@ -72,12 +72,10 @@ 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 +#options FONT_GALLANT12x22 +#options FONT_QVSS8x15 # pmax specific options COMPAT_ULTRIX # ultrix compatibility diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC index 4d58de443c38..080303550a35 100644 --- a/sys/arch/pmax/conf/GENERIC +++ b/sys/arch/pmax/conf/GENERIC @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.43 1999/04/26 02:20:02 jonathan Exp $ +# $NetBSD: GENERIC,v 1.44 1999/04/26 04:30:26 ad Exp $ # # Distribution kernel (any model) kernel config file # @@ -92,12 +92,10 @@ 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 +#options FONT_GALLANT12x22 +#options FONT_QVSS8x15 # pmax specific options COMPAT_ULTRIX # Ultrix compatibility diff --git a/sys/arch/pmax/conf/INSTALL b/sys/arch/pmax/conf/INSTALL index 738a5ab40ac1..3526ab6835b3 100644 --- a/sys/arch/pmax/conf/INSTALL +++ b/sys/arch/pmax/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.20 1999/04/20 05:56:52 simonb Exp $ +# $NetBSD: INSTALL,v 1.21 1999/04/26 04:30:26 ad Exp $ # # Distribution install kernel (any model) # netbsd: cut-down kernel for miniroots. @@ -61,12 +61,10 @@ 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 +#options FONT_GALLANT12x22 +#options FONT_QVSS8x15 # pmax specific options "HZ=256" # RTC rate required diff --git a/sys/arch/pmax/conf/R4000 b/sys/arch/pmax/conf/R4000 index 492123a49887..aefa9eba99a0 100644 --- a/sys/arch/pmax/conf/R4000 +++ b/sys/arch/pmax/conf/R4000 @@ -2,7 +2,7 @@ # R4000 (any model) kernel config file # -# $NetBSD: R4000,v 1.14 1999/04/13 18:53:28 ad Exp $ +# $NetBSD: R4000,v 1.15 1999/04/26 04:30:26 ad Exp $ # include "arch/pmax/conf/std.pmax" @@ -72,12 +72,10 @@ 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 +#options FONT_GALLANT12x22 +#options FONT_QVSS8x15 # pmax specific options COMPAT_ULTRIX # ultrix compatibility diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax index 7f01f8a60bf3..38235f98de01 100644 --- a/sys/arch/pmax/conf/files.pmax +++ b/sys/arch/pmax/conf/files.pmax @@ -1,4 +1,4 @@ -# $NetBSD: files.pmax,v 1.62 1999/04/13 18:53:28 ad Exp $ +# $NetBSD: files.pmax,v 1.63 1999/04/26 04:30:26 ad Exp $ # DECstation-specific configuration info # maxpartitions must be first item in files.${ARCH}. @@ -180,9 +180,12 @@ file arch/pmax/dev/dtop.c dtop needs-flag attach le at ibus with le_pmax: le24, le_dec_subr file dev/tc/if_le_ibus.c le_pmax needs-flag #for kn01_intr +# Raster operations for rcons. This isn't in the rcons section, since +# it depends on fb devices for configuration glue. +include "dev/rasops/files.rasops" # 3100 (pmax) onboard framebuffer -device pm +device pm: rasops1 file arch/pmax/dev/pm.c pm needs-flag file arch/pmax/dev/bt478.c pm attach pm at ibus with pm_ds @@ -192,15 +195,15 @@ file arch/pmax/dev/pm_ds.c pm_ds # Turbochannel options. # ######################################################################### -device cfb +device cfb: rasops8 attach cfb at tc file arch/pmax/dev/cfb.c cfb needs-flag -device sfb +device sfb: rasops8 attach sfb at tc file arch/pmax/dev/sfb.c sfb needs-flag -device mfb +device mfb: rasops8 attach mfb at tc file arch/pmax/dev/mfb.c mfb needs-flag @@ -210,7 +213,7 @@ attach scc at ioasic file arch/pmax/tc/scc.c scc needs-flag # MAXINE onboard framebuffer -device xcfb +device xcfb: rasops8 attach xcfb at tc file arch/pmax/dev/xcfb.c xcfb needs-flag file arch/pmax/dev/ims332.c xcfb @@ -249,7 +252,6 @@ 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