Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mac68k/conf Update for wscons.



details:   https://anonhg.NetBSD.org/src/rev/aa55b818bfbb
branches:  trunk
changeset: 482106:aa55b818bfbb
user:      scottr <scottr%NetBSD.org@localhost>
date:      Mon Feb 14 08:58:41 2000 +0000

description:
Update for wscons.

diffstat:

 sys/arch/mac68k/conf/MYSTERY |  29 +++++++++++++++++++++++------
 sys/arch/mac68k/conf/PUMA    |  29 +++++++++++++++++++++++------
 sys/arch/mac68k/conf/SPOT    |  26 +++++++++++++++++++-------
 3 files changed, 65 insertions(+), 19 deletions(-)

diffs (180 lines):

diff -r a363a4a3fd5e -r aa55b818bfbb sys/arch/mac68k/conf/MYSTERY
--- a/sys/arch/mac68k/conf/MYSTERY      Mon Feb 14 08:48:08 2000 +0000
+++ b/sys/arch/mac68k/conf/MYSTERY      Mon Feb 14 08:58:41 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MYSTERY,v 1.22 1999/07/29 10:37:19 augustss Exp $
+#      $NetBSD: MYSTERY,v 1.23 2000/02/14 08:58:41 scottr Exp $
 #
 # GENERIC
 
@@ -102,6 +102,16 @@
 # Warning, these may compile large string tables into the kernel!
 options        SCSIVERBOSE     # human readable SCSI error messages
 
+# wscons options
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+options        WSDISPLAY_COMPAT_ITEFONT # use ite font (6x10)
+
+# rcons options; note that 1-bit and 8-bit displays are supported by default.
+options        RCONS_2BPP              # Support for 2-bit display
+options        RCONS_4BPP              # Support for 4-bit display
+options        RCONS_16BPP             # Support for 16-bit display
+
 # Mac-specific options
 options        ZS_CONSOLE_ABORT
 options        DISABLE_EXT_CACHE # Don't use IIci external cache
@@ -135,18 +145,23 @@
 # Console Devices
 
 # Apple Desktop Bus interface
-adb0   at obio?                        # ADB event device
+adb0   at obio?
+aed*   at adb?                         # ADB event device
+akbd*  at adb?                         # ADB keyboard
+ams*   at adb?                         # ADB mouse
 
 # Basic frame buffer support
 #intvid0       at obio?                        # Internal video hardware
 macvid*        at nubus?                       # NuBus video card
 
 # Device-independent frame buffer interface
-#grf*  at intvid?
-grf*   at macvid?
+#macfb*        at intvid?
+macfb* at macvid?
 
-# Integrated Terminal Emulator (console) support
-ite0   at grf?
+# Workstation Console devices
+wsdisplay0 at macfb? console ?
+wskbd0 at akbd? console ?
+wsmouse0 at ams?
 
 
 # Serial Devices
@@ -211,6 +226,8 @@
 #pseudo-device tun             2       # network tunneling over tty
 
 # miscellaneous pseudo-devices
+pseudo-device  grf             2       # grf emulation for wscons
+pseudo-device  ite             1       # ite emulation for wscons
 pseudo-device  pty             64      # pseudo-terminals
 #pseudo-device tb              1       # tablet line discipline
 
diff -r a363a4a3fd5e -r aa55b818bfbb sys/arch/mac68k/conf/PUMA
--- a/sys/arch/mac68k/conf/PUMA Mon Feb 14 08:48:08 2000 +0000
+++ b/sys/arch/mac68k/conf/PUMA Mon Feb 14 08:58:41 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: PUMA,v 1.29 1999/07/29 10:37:19 augustss Exp $
+#      $NetBSD: PUMA,v 1.30 2000/02/14 08:58:42 scottr Exp $
 #
 # PUMA
 
@@ -72,6 +72,16 @@
 # Warning, these may compile large string tables into the kernel!
 options        SCSIVERBOSE     # human readable SCSI error messages
 
+# wscons options
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+options        WSDISPLAY_COMPAT_ITEFONT # use ite font (6x10)
+
+# rcons options; note that 1-bit and 8-bit displays are supported by default.
+options        RCONS_2BPP              # Support for 2-bit display
+options        RCONS_4BPP              # Support for 4-bit display
+options        RCONS_16BPP             # Support for 16-bit display
+
 
 # Kernel root file system and dump configuration.
 config         netbsd  root on ? type ?
@@ -97,18 +107,23 @@
 # Console Devices
 
 # Apple Desktop Bus interface
-adb0   at obio?                        # ADB event device
+adb0   at obio?
+aed*   at adb?                         # ADB event device
+akbd*  at adb?                         # ADB keyboard
+ams*   at adb?                         # ADB mouse
 
 # Basic frame buffer support
 intvid0        at obio?                        # Internal video hardware
 macvid*        at nubus?                       # NuBus video card
 
 # Device-independent frame buffer interface
-grf*   at intvid?
-grf*   at macvid?
+macfb* at intvid?
+macfb* at macvid?
 
-# Integrated Terminal Emulator (console) support
-ite0   at grf?
+# Workstation Console devices
+wsdisplay0 at macfb? console ?
+wskbd0 at akbd? console ?
+wsmouse0 at ams?
 
 
 # Serial Devices
@@ -163,4 +178,6 @@
 pseudo-device  loop                    # network loopback
 
 # miscellaneous pseudo-devices
+pseudo-device  grf             2       # grf emulation for wscons
+pseudo-device  ite             1       # ite emulation for wscons
 pseudo-device  pty             64      # pseudo-terminals
diff -r a363a4a3fd5e -r aa55b818bfbb sys/arch/mac68k/conf/SPOT
--- a/sys/arch/mac68k/conf/SPOT Mon Feb 14 08:48:08 2000 +0000
+++ b/sys/arch/mac68k/conf/SPOT Mon Feb 14 08:58:41 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SPOT,v 1.38 1999/07/29 10:37:19 augustss Exp $
+#      $NetBSD: SPOT,v 1.39 2000/02/14 08:58:42 scottr Exp $
 #
 # GENERIC
 
@@ -104,6 +104,16 @@
 # Warning, these may compile large string tables into the kernel!
 #options       SCSIVERBOSE     # human readable SCSI error messages
 
+# wscons options
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+options        WSDISPLAY_COMPAT_ITEFONT # use ite font (6x10)
+
+# rcons options; note that 1-bit and 8-bit displays are supported by default.
+#options       RCONS_2BPP              # Support for 2-bit display
+#options       RCONS_4BPP              # Support for 4-bit display
+#options       RCONS_16BPP             # Support for 16-bit display
+
 # Mac-specific options
 #options       ZS_CONSOLE_ABORT
 #options       DISABLE_EXT_CACHE # Don't use IIci external cache
@@ -136,19 +146,21 @@
 # Apple Desktop Bus interface
 adb0   at obio?
 aed*   at adb?                         # ADB event device
-kbd*   at adb?                         # ADB keyboard
-ms*    at adb?                         # ADB mouse
+akbd*  at adb?                         # ADB keyboard
+ams*   at adb?                         # ADB mouse
 
 # Basic frame buffer support
 #intvid0       at obio?                        # Internal video hardware
 macvid*        at nubus?                       # NuBus video card
 
 # Device-independent frame buffer interface
-#grf*  at intvid?
-grf*   at macvid?
+#macfb*        at intvid?
+macfb* at macvid?
 
-# Integrated Terminal Emulator (console) support
-ite0   at grf?
+# Workstation Console devices
+wsdisplay0 at macfb? console ?
+wskbd0 at akbd? console ?
+wsmouse0 at ams?
 
 
 # Serial Devices



Home | Main Index | Thread Index | Old Index