Module Name: src Committed By: phx Date: Fri Nov 13 16:04:07 UTC 2015
Modified Files: src/sys/arch/amiga/conf: WSCONS Log Message: Make sure the graphics device which has the console gets wsdisplay0, otherwise neither virtual terminals nor Xorg's wsfb driver will work. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/conf/WSCONS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amiga/conf/WSCONS diff -u src/sys/arch/amiga/conf/WSCONS:1.67 src/sys/arch/amiga/conf/WSCONS:1.68 --- src/sys/arch/amiga/conf/WSCONS:1.67 Thu Oct 3 13:40:26 2013 +++ src/sys/arch/amiga/conf/WSCONS Fri Nov 13 16:04:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: WSCONS,v 1.67 2013/10/03 13:40:26 rkujawa Exp $ +# $NetBSD: WSCONS,v 1.68 2015/11/13 16:04:07 phx Exp $ # GENERIC with wscons(4) # @@ -6,8 +6,6 @@ include "arch/amiga/conf/GENERIC" # wscons(4)-aware interface to amiga custom chips. # -amidisplaycc0 at mainbus0 # wscons interface to custom chips -wsdisplay0 at amidisplaycc0 console ? options WSEMUL_VT100 options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options FONT_VT220L8x10 @@ -23,29 +21,23 @@ wsmouse* at ms? ums* at uhidev? reportid ? wsmouse* at ums? +amidisplaycc0 at mainbus0 # wscons interface to custom chips + +# Disable grf(4) devices without wsdisplay support. no grfcc0 at mainbus0 no grfrt0 at zbus0 no grfrh0 at zbus0 no grfcl* at zbus0 no grful0 at zbus0 no grfet* at zbus0 -#no grfcv0 at zbus0 -#no grfcv3d0 at zbus0 - -# Disable grf(4) devices for non-wsdisplay drivers. no grf0 at grfcc0 no grf1 at grfrt0 no grf2 at grfrh0 no grf3 at grfcl? no grf4 at grful0 no grf6 at grfet? -#no grf5 at grfcv0 -#no grf7 at grfcv3d0 - -wsdisplay* at grf5 console ? # wsdisplay on top of grf (CV64) -wsdisplay* at grf7 console ? # wsdisplay on top of grf (CV64/3D) -# Disable ite(4) for all drivers. +# Disable ite(4) for all grf(4) drivers. no ite0 at grf0 no ite1 at grf1 no ite2 at grf2 @@ -64,8 +56,8 @@ voodoofb* at pci? # 3Dfx Voodoo 3 in G # G-REX. #options P5PB_CONSOLE +wsdisplay0 at wsemuldisplaydev? console 1 wsdisplay* at wsemuldisplaydev? console ? pseudo-device wsfont # wsfont(4) dynamic font loading support pseudo-device wsmux # mouse & keyboard multiplexor -