diff options
| -rw-r--r-- | sys/arch/sparc/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/SUN4 | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/SUN4C | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/SUN4M | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/files.sparc | 36 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU1 | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISKU5 | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/files.sparc64 | 6 | ||||
| -rw-r--r-- | sys/dev/sbus/files.sbus | 22 | ||||
| -rw-r--r-- | sys/dev/wscons/files.wscons | 19 | ||||
| -rw-r--r-- | sys/dev/wscons/wsemulconf.c | 8 | ||||
| -rw-r--r-- | sys/dev/wscons/wsemulvar.h | 8 |
15 files changed, 81 insertions, 63 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 54eb2d56719..d1ed844d077 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.87 2006/06/26 22:16:23 miod Exp $ +# $OpenBSD: GENERIC,v 1.88 2006/12/09 20:06:46 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -30,6 +30,9 @@ option COMPAT_SUNOS # compatibility with SunOS binaries option COMPAT_SVR4 # compatibility with SVR4 binaries option PROCFS # /proc +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + # Generic swap; second partition of root disk or network. config bsd swap generic diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index 8572f165f9a..353a53e5a88 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.58 2006/06/26 22:16:23 miod Exp $ +# $OpenBSD: RAMDISK,v 1.59 2006/12/09 20:06:46 miod Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -43,6 +43,9 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc. #option COMPAT_SUNOS # compatibility with SunOS binaries #option COMPAT_SVR4 # compatibility with SVR4 binaries +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + # Generic swap; second partition of root disk or network. config bsd root on rd0a diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4 index 598e953b16e..f3ac769aa54 100644 --- a/sys/arch/sparc/conf/SUN4 +++ b/sys/arch/sparc/conf/SUN4 @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4,v 1.33 2006/06/26 22:16:23 miod Exp $ +# $OpenBSD: SUN4,v 1.34 2006/12/09 20:06:46 miod Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -15,6 +15,9 @@ option COMPAT_SUNOS # compatibility with SunOS binaries option COMPAT_SVR4 # compatibility with SVR4 binaries option PROCFS # /proc +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + maxusers 16 # estimated number of users # Generic swap; second partition of root disk or network. diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 2044e031bd7..258dd1a4ee3 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.55 2006/06/26 22:16:23 miod Exp $ +# $OpenBSD: SUN4C,v 1.56 2006/12/09 20:06:46 miod Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -18,6 +18,9 @@ option COMPAT_SUNOS # compatibility with SunOS binaries option COMPAT_SVR4 # compatibility with SVR4 binaries option PROCFS # /proc +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + maxusers 18 # estimated number of users # Generic swap; second partition of root disk or network. diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index 531002af273..70fe7dafef8 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.71 2006/06/26 22:16:23 miod Exp $ +# $OpenBSD: SUN4M,v 1.72 2006/12/09 20:06:46 miod Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -20,6 +20,9 @@ option COMPAT_SUNOS # compatibility with SunOS binaries option COMPAT_SVR4 # compatibility with SVR4 binaries option PROCFS # /proc +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + maxusers 32 # estimated number of users # Generic swap; second partition of root disk or network. diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index 0af7768f6cc..50ff47fa84b 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc,v 1.74 2006/12/03 22:13:04 miod Exp $ +# $OpenBSD: files.sparc,v 1.75 2006/12/09 20:06:46 miod Exp $ # $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 @@ -158,48 +158,48 @@ include "dev/wsfont/files.wsfont" define bt_dac file arch/sparc/dev/bt_subr.c bt_dac -device agten: wsemuldisplaydev, rasops8, wsemul_sun +device agten: wsemuldisplaydev, rasops8 attach agten at sbus file arch/sparc/dev/agten.c agten -device bwtwo: wsemuldisplaydev, rasops1, wsemul_sun +device bwtwo: wsemuldisplaydev, rasops1 attach bwtwo at sbus, obio, vmes, vmel file arch/sparc/dev/bwtwo.c bwtwo -device cgeight: wsemuldisplaydev, rasops1, wsemul_sun, bt_dac +device cgeight: wsemuldisplaydev, rasops1, bt_dac attach cgeight at obio file arch/sparc/dev/cgeight.c cgeight -device cgfour: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac +device cgfour: wsemuldisplaydev, rasops8, bt_dac attach cgfour at obio file arch/sparc/dev/cgfour.c cgfour -device cgfourteen: wsemuldisplaydev, rasops8, wsemul_sun +device cgfourteen: wsemuldisplaydev, rasops8 attach cgfourteen at obio file arch/sparc/dev/cgfourteen.c cgfourteen -device cgsix: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac +device cgsix: wsemuldisplaydev, rasops8, bt_dac attach cgsix at sbus, obio file arch/sparc/dev/cgsix.c cgsix -device cgthree: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac +device cgthree: wsemuldisplaydev, rasops8, bt_dac attach cgthree at sbus file arch/sparc/dev/cgthree.c cgthree -device cgtwelve: wsemuldisplaydev, rasops1, wsemul_sun +device cgtwelve: wsemuldisplaydev, rasops1 attach cgtwelve at sbus file arch/sparc/dev/cgtwelve.c cgtwelve -device cgtwo: wsemuldisplaydev, rasops8, wsemul_sun +device cgtwo: wsemuldisplaydev, rasops8 attach cgtwo at vmes file arch/sparc/dev/cgtwo.c cgtwo -device mgx: wsemuldisplaydev, rasops8, wsemul_sun +device mgx: wsemuldisplaydev, rasops8 attach mgx at sbus file arch/sparc/dev/mgx.c mgx # Onboard Weitek P9000 found on Tadpole SPARCbook 3, and BT ``Chameleon'' RAMDAC -device pninek: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac +device pninek: wsemuldisplaydev, rasops8, bt_dac attach pninek at sbus file arch/sparc/dev/p9000.c pninek @@ -208,27 +208,27 @@ attach btcham at obio file arch/sparc/dev/bt445.c btcham # Onboard Weitek p9100 found on Tadpole SPARCbook 3GS/3GX/3TX/3XP -device pnozz: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, wsemul_sun, bt_dac +device pnozz: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, bt_dac attach pnozz at sbus file arch/sparc/dev/p9100.c pnozz -device rfx: wsemuldisplaydev, rasops8, wsemul_sun +device rfx: wsemuldisplaydev, rasops8 attach rfx at sbus file arch/sparc/dev/rfx.c rfx -device tcx: wsemuldisplaydev, rasops8, wsemul_sun, bt_dac +device tcx: wsemuldisplaydev, rasops8, bt_dac attach tcx at sbus file arch/sparc/dev/tcx.c tcx -device tvtwo: wsemuldisplaydev, rasops8, wsemul_sun +device tvtwo: wsemuldisplaydev, rasops8 attach tvtwo at sbus file arch/sparc/dev/tvtwo.c tvtwo -device vigra: wsemuldisplaydev, rasops8, wsemul_sun +device vigra: wsemuldisplaydev, rasops8 attach vigra at sbus file arch/sparc/dev/vigra.c vigra -device zx: wsemuldisplaydev, rasops8, wsemul_sun +device zx: wsemuldisplaydev, rasops8 attach zx at sbus file arch/sparc/dev/zx.c zx diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 00dcc244b9a..2f05b66ceb7 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.161 2006/11/25 15:57:16 brad Exp $ +# $OpenBSD: GENERIC,v 1.162 2006/12/09 20:06:48 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -18,6 +18,9 @@ option USER_PCICONF # user-space PCI configuration option APERTURE option USBVERBOSE +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + config bsd swap generic # Main bus and CPU .. all systems. diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 1ecbde9d903..690d30e3462 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.57 2006/11/26 19:10:16 dlg Exp $ +# $OpenBSD: RAMDISK,v 1.58 2006/12/09 20:06:48 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -28,6 +28,9 @@ option INET # IP + ICMP + TCP + UDP option INET6 # IPv6 (needs INET) option BOOT_CONFIG # add support for boot -c +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + # Generic swap; second partition of root disk or network. config bsd root on rd0a diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index 645592f69e2..4a36f20fb30 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU1,v 1.17 2006/06/26 22:16:23 miod Exp $ +# $OpenBSD: RAMDISKU1,v 1.18 2006/12/09 20:06:48 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -23,6 +23,9 @@ option FFS # UFS option INET # IP + ICMP + TCP + UDP option BOOT_CONFIG # add support for boot -c +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + # Generic swap; second partition of root disk or network. config bsd root on rd0a diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index 6d1d7049866..629695bb9d2 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.11 2006/06/21 19:28:08 jason Exp $ +# $OpenBSD: RAMDISKU5,v 1.12 2006/12/09 20:06:48 miod Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -23,6 +23,9 @@ option FFS # UFS option INET # IP + ICMP + TCP + UDP option BOOT_CONFIG # add support for boot -c +option WSEMUL_SUN # provide sun terminal emulation; required +option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation + # Generic swap; second partition of root disk or network. config bsd root on rd0a diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index 0b8585f8497..376f598c59c 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc64,v 1.74 2006/12/02 15:55:16 miod Exp $ +# $OpenBSD: files.sparc64,v 1.75 2006/12/09 20:06:48 miod Exp $ # $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $ # maxpartitions must be first item in files.${ARCH} @@ -71,7 +71,7 @@ attach sbus at mainbus with sbus_mb attach sbus at xbox with sbus_xbox file arch/sparc64/dev/sbus.c sbus -device creator: wsemuldisplaydev, rasops32, wsemul_sun +device creator: wsemuldisplaydev, rasops32 attach creator at mainbus, upa file arch/sparc64/dev/creator.c creator @@ -92,7 +92,7 @@ file arch/sparc64/dev/pci_machdep.c psycho | schizo attach hme at pci with hme_pci file dev/pci/if_hme_pci.c hme_pci -device vgafb: wsemuldisplaydev, rasops_bswap, rasops8, rasops16, rasops32, wsemul_sun +device vgafb: wsemuldisplaydev, rasops_bswap, rasops8, rasops16, rasops32 attach vgafb at pci file arch/sparc64/dev/vgafb.c vgafb diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus index aff0aa10327..6c7b26bc6f0 100644 --- a/sys/dev/sbus/files.sbus +++ b/sys/dev/sbus/files.sbus @@ -1,4 +1,4 @@ -# $OpenBSD: files.sbus,v 1.34 2006/12/02 11:00:33 miod Exp $ +# $OpenBSD: files.sbus,v 1.35 2006/12/09 20:06:48 miod Exp $ # $NetBSD: files.sbus,v 1.16 2000/12/08 17:29:12 martin Exp $ # # Config file and device description for machine-independent SBUS code. @@ -55,43 +55,43 @@ file dev/sbus/cs4231.c audiocs attach isp at sbus with isp_sbus file dev/sbus/isp_sbus.c isp_sbus -device agten: wsemuldisplaydev, rasops8, wsemul_sun +device agten: wsemuldisplaydev, rasops8 attach agten at sbus file dev/sbus/agten.c agten -device bwtwo: wsemuldisplaydev, rasops1, wsemul_sun +device bwtwo: wsemuldisplaydev, rasops1 attach bwtwo at sbus file dev/sbus/bwtwo.c bwtwo -device cgsix: wsemuldisplaydev, rasops8, wsemul_sun +device cgsix: wsemuldisplaydev, rasops8 attach cgsix at sbus file dev/sbus/cgsix.c cgsix -device cgthree: wsemuldisplaydev, rasops8, wsemul_sun +device cgthree: wsemuldisplaydev, rasops8 attach cgthree at sbus file dev/sbus/cgthree.c cgthree -device cgtwelve: wsemuldisplaydev, rasops1, wsemul_sun +device cgtwelve: wsemuldisplaydev, rasops1 attach cgtwelve at sbus file dev/sbus/cgtwelve.c cgtwelve -device mgx: wsemuldisplaydev, rasops8, wsemul_sun +device mgx: wsemuldisplaydev, rasops8 attach mgx at sbus file dev/sbus/mgx.c mgx -device rfx: wsemuldisplaydev, rasops8, wsemul_sun +device rfx: wsemuldisplaydev, rasops8 attach rfx at sbus file dev/sbus/rfx.c rfx -device tvtwo: wsemuldisplaydev, rasops8, wsemul_sun +device tvtwo: wsemuldisplaydev, rasops8 attach tvtwo at sbus file dev/sbus/tvtwo.c tvtwo -device vigra: wsemuldisplaydev, rasops8, wsemul_sun +device vigra: wsemuldisplaydev, rasops8 attach vigra at sbus file dev/sbus/vigra.c vigra -device zx: wsemuldisplaydev, rasops8, wsemul_sun +device zx: wsemuldisplaydev, rasops8 attach zx at sbus file dev/sbus/zx.c zx diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons index c84b9363020..362da8dce90 100644 --- a/sys/dev/wscons/files.wscons +++ b/sys/dev/wscons/files.wscons @@ -1,4 +1,4 @@ -# $OpenBSD: files.wscons,v 1.13 2006/08/14 15:56:02 miod Exp $ +# $OpenBSD: files.wscons,v 1.14 2006/12/09 20:06:48 miod Exp $ # $NetBSD: files.wscons,v 1.34 2005/05/04 01:52:16 augustss Exp $ # @@ -24,12 +24,6 @@ attach wsmouse at wsmousedev file dev/wscons/wsdisplay.c wsdisplay needs-flag file dev/wscons/wsdisplay_compat_usl.c wsdisplay & wsdisplay_compat_usl -file dev/wscons/wsemulconf.c wsdisplay -file dev/wscons/wsemul_dumb.c wsdisplay & wsemul_dumb -file dev/wscons/wsemul_vt100.c wsdisplay & !wsemul_no_vt100 -file dev/wscons/wsemul_vt100_subr.c wsdisplay & !wsemul_no_vt100 -file dev/wscons/wsemul_vt100_chars.c wsdisplay & !wsemul_no_vt100 -file dev/wscons/wsemul_vt100_keys.c wsdisplay & !wsemul_no_vt100 file dev/wscons/wsevent.c wsdisplay | wskbd | wsmouse | wsmux file dev/wscons/wskbd.c wskbd needs-flag @@ -41,6 +35,11 @@ file dev/wscons/wsmouse.c wsmouse needs-flag pseudo-device wsmux file dev/wscons/wsmux.c wsmux needs-flag -define wsemul_sun -file dev/wscons/wsemul_sun.c wsdisplay & - wsemul_sun needs-flag +# emulation code +file dev/wscons/wsemulconf.c wsdisplay +file dev/wscons/wsemul_dumb.c wsdisplay & wsemul_dumb +file dev/wscons/wsemul_sun.c wsdisplay & wsemul_sun +file dev/wscons/wsemul_vt100.c wsdisplay & !wsemul_no_vt100 +file dev/wscons/wsemul_vt100_subr.c wsdisplay & !wsemul_no_vt100 +file dev/wscons/wsemul_vt100_chars.c wsdisplay & !wsemul_no_vt100 +file dev/wscons/wsemul_vt100_keys.c wsdisplay & !wsemul_no_vt100 diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c index bac9ab91920..eeabbf5175f 100644 --- a/sys/dev/wscons/wsemulconf.c +++ b/sys/dev/wscons/wsemulconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemulconf.c,v 1.5 2002/01/03 21:58:59 jason Exp $ */ +/* $OpenBSD: wsemulconf.c,v 1.6 2006/12/09 20:06:48 miod Exp $ */ /* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */ /* @@ -33,19 +33,17 @@ #include "wsdisplay.h" -#include <sys/cdefs.h> - #include <sys/param.h> #include <sys/systm.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> #include <dev/wscons/wsksymvar.h> -#include <dev/wscons/wsemulvar.h> /* pulls in opt_wsemul.h */ +#include <dev/wscons/wsemulvar.h> #include <dev/wscons/wscons_callbacks.h> static const struct wsemul_ops *wsemul_conf[] = { -#if defined(WSEMUL_SUN) || (NWSEMUL_SUN > 0) +#ifdef WSEMUL_SUN &wsemul_sun_ops, #endif #ifndef WSEMUL_NO_VT100 diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h index 050429448e1..4c19f5c91c3 100644 --- a/sys/dev/wscons/wsemulvar.h +++ b/sys/dev/wscons/wsemulvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemulvar.h,v 1.6 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: wsemulvar.h,v 1.7 2006/12/09 20:06:48 miod Exp $ */ /* $NetBSD: wsemulvar.h,v 1.6 1999/01/17 15:46:15 drochner Exp $ */ /* @@ -54,15 +54,9 @@ struct wsemul_ops { void (*reset)(void *, enum wsemul_resetops); }; -#ifdef WSEMUL_DUMB extern const struct wsemul_ops wsemul_dumb_ops; -#endif -#if defined(WSEMUL_SUN) || NWSEMUL_SUN > 0 extern const struct wsemul_ops wsemul_sun_ops; -#endif -#ifndef WSEMUL_NO_VT100 extern const struct wsemul_ops wsemul_vt100_ops; -#endif const struct wsemul_ops *wsemul_pick(const char *); |