Index: src/sys/arch/mac68k/conf/GENERIC =================================================================== --- src.orig/sys/arch/mac68k/conf/GENERIC 2007-09-02 18:49:03.000000000 +0200 +++ src/sys/arch/mac68k/conf/GENERIC 2007-09-02 19:04:10.000000000 +0200 @@ -173,16 +173,6 @@ # 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 ALTXBUTTONS # Map Opt-{1,2,3} to mouse buttons #options DISABLE_EXT_CACHE # If really paranoid, disable IIci ext. cache @@ -192,6 +182,34 @@ options NFS_BOOT_DHCP +# +# wscons options +# +# builtin terminal emulations +#options WSEMUL_SUN # sun terminal emulation +options WSEMUL_VT100 # VT100 / VT220 emulation +# customization of console and kernel output - see dev/wscons/wsdisplayvar.h +options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8) +#options WS_DEFAULT_FG=WSCOL_WHITE +#options WS_DEFAULT_BG=WSCOL_BLACK +#options WS_DEFAULT_COLATTR="(0)" +#options WS_DEFAULT_MONOATTR="(0)" +options WS_KERNEL_FG=WSCOL_GREEN +#options WS_KERNEL_BG=WSCOL_BLACK +#options WS_KERNEL_COLATTR="" +#options WS_KERNEL_MONOATTR="" +# compatibility to other console drivers +options WSDISPLAY_COMPAT_PCVT # emulate some ioctls +options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls +options WSDISPLAY_COMPAT_USL # VT handling +options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes +#options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode +#options WSKBD_USONLY # strip off non-US keymaps +# allocate a number of virtual screens at autoconfiguration time +#options WSDISPLAY_DEFAULTSCREENS=4 +# console scrolling support. +options WSDISPLAY_SCROLLSUPPORT + # Kernel root file system and dump configuration. config netbsd root on ? type ? @@ -219,18 +237,14 @@ 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 -macfb* at intvid? -macfb* at macvid? - -# Workstation Console devices -wsdisplay* at macfb? console ? -wskbd* at akbd? console ? -wsmouse* at ams? +# Generic framebuffer support +genfb* at obio? # Internal video hardware +genfb* at nubus? # NuBus video cards + +# wscons +wsdisplay* at genfb? console ? +wskbd* at akbd? console ? +wsmouse* at ams? # Serial Devices @@ -348,6 +362,10 @@ #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if +# wscons pseudo-devices +pseudo-device wsmux # mouse & keyboard multiplexor +pseudo-device wsfont + # Veriexec # # a pseudo device needed for veriexec Index: src/sys/arch/mac68k/conf/INSTALL =================================================================== --- src.orig/sys/arch/mac68k/conf/INSTALL 2007-09-02 18:49:03.000000000 +0200 +++ src/sys/arch/mac68k/conf/INSTALL 2007-09-02 19:04:10.000000000 +0200 @@ -86,6 +86,34 @@ options NFS_BOOT_DHCP +# +# wscons options +# +# builtin terminal emulations +#options WSEMUL_SUN # sun terminal emulation +options WSEMUL_VT100 # VT100 / VT220 emulation +# customization of console and kernel output - see dev/wscons/wsdisplayvar.h +#options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8) +#options WS_DEFAULT_FG=WSCOL_WHITE +#options WS_DEFAULT_BG=WSCOL_BLACK +#options WS_DEFAULT_COLATTR="(0)" +#options WS_DEFAULT_MONOATTR="(0)" +#options WS_KERNEL_FG=WSCOL_GREEN +#options WS_KERNEL_BG=WSCOL_BLACK +#options WS_KERNEL_COLATTR="" +#options WS_KERNEL_MONOATTR="" +# compatibility to other console drivers +#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls +#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls +#options WSDISPLAY_COMPAT_USL # VT handling +#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes +#options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode +#options WSKBD_USONLY # strip off non-US keymaps +# allocate a number of virtual screens at autoconfiguration time +#options WSDISPLAY_DEFAULTSCREENS=4 +# console scrolling support. +#options WSDISPLAY_SCROLLSUPPORT + # Kernel root file system and dump configuration. config netbsd root on ? type ? @@ -113,18 +141,14 @@ 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 -macfb* at intvid? -macfb* at macvid? - -# Workstation Console devices -wsdisplay0 at macfb? console ? -wskbd0 at akbd? console ? -wsmouse0 at ams? +# Generic framebuffer support +genfb* at obio? # Internal video hardware +genfb* at nubus? # NuBus video cards + +# wscons +wsdisplay* at genfb? console ? +wskbd* at akbd? console ? +#wsmouse* at ams? # Serial Devices @@ -200,3 +224,7 @@ pseudo-device pty 2 # pseudo-terminals (Sysinst needs two) pseudo-device rnd # /dev/random and in-kernel generator + +# wscons pseudo-devices +pseudo-device wsmux # mouse & keyboard multiplexor +pseudo-device wsfont Index: src/sys/arch/mac68k/conf/SMALLRAM =================================================================== --- src.orig/sys/arch/mac68k/conf/SMALLRAM 2007-09-02 18:49:41.000000000 +0200 +++ src/sys/arch/mac68k/conf/SMALLRAM 2007-09-02 19:05:25.000000000 +0200 @@ -73,12 +73,15 @@ no options SCSIVERBOSE -no options RCONS_2BPP -no options RCONS_4BPP -no options RCONS_16BPP - no options ZS_CONSOLE_ABORT +no options WSDISPLAY_CUSTOM_OUTPUT +no options WSDISPLAY_COMPAT_PCVT +no options WSDISPLAY_COMPAT_SYSCONS +no options WSDISPLAY_COMPAT_USL +no options WSDISPLAY_COMPAT_RAWKBD +no options WSDISPLAY_SCROLLSUPPORT + sbc0 at obio? addr 0 flags 0x1 # MI SCSI NCR 5380 no ncrscsi0 no esp0