Remove WSDISPLAY_COMPAT_SYSCONS. We no longer run FreeBSD binary X11

servers.  Pointed out by jmc@, ok deraadt@ millert@

3 files changed, 4 insertions, 18 deletions

diff --git a/share/man/man4/wscons.4 b/share/man/man4/wscons.4
index cbe6452f406..bcd1724f0b1 100644
--- a/share/man/man4/wscons.4
+++ b/share/man/man4/wscons.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wscons.4,v 1.19 2016/02/28 16:07:57 naddy Exp $
+.\" $OpenBSD: wscons.4,v 1.20 2016/03/03 18:00:49 naddy Exp $
 .\" $NetBSD: wscons.4,v 1.11 2000/04/13 11:14:42 is Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 28 2016 $
+.Dd $Mdocdate: March 3 2016 $
 .Dt WSCONS 4
 .Os
 .Sh NAME
@@ -38,7 +38,6 @@
 .Cd option WS_KERNEL_FG=WSCOL_XXX
 .Cd option WS_KERNEL_BG=WSCOL_XXX
 .Cd option WSDISPLAY_COMPAT_PCVT
-.Cd option WSDISPLAY_COMPAT_SYSCONS
 .Cd option WSDISPLAY_COMPAT_USL
 .Cd option WSDISPLAY_COMPAT_RAWKBD
 .Pp
@@ -202,11 +201,6 @@ Emulates enough of the
 / i386
 .Dq pcvt
 driver to make X servers work.
-.It Cd WSDISPLAY_COMPAT_SYSCONS
-Emulates enough of the i386
-.Fx
-.Dq syscons
-driver to make X servers work.
 .El
 .Pp
 .Em Other options :
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index c61b4aa817a..2b6be4afc0c 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_compat_usl.c,v 1.28 2015/09/08 11:13:20 deraadt Exp $ */
+/* $OpenBSD: wsdisplay_compat_usl.c,v 1.29 2016/03/03 18:00:49 naddy Exp $ */
 /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */
 
 /*
@@ -330,11 +330,6 @@ wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
 #undef id
 		return (0);
 #endif
-#ifdef WSDISPLAY_COMPAT_SYSCONS
-	    case CONS_GETVERS:
-		*(int *)data = 0x200;    /* version 2.0 */
-		return (0);
-#endif
 
 	    default:
 		return (-1);
diff --git a/sys/dev/wscons/wsdisplay_usl_io.h b/sys/dev/wscons/wsdisplay_usl_io.h
index 6d2a03e3326..0748b8e4830 100644
--- a/sys/dev/wscons/wsdisplay_usl_io.h
+++ b/sys/dev/wscons/wsdisplay_usl_io.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_usl_io.h,v 1.2 2006/07/06 18:20:45 miod Exp $ */
+/* $OpenBSD: wsdisplay_usl_io.h,v 1.3 2016/03/03 18:00:49 naddy Exp $ */
 /* $NetBSD: wsdisplay_usl_io.h,v 1.1 1998/06/11 22:00:04 drochner Exp $ */
 
 #define VT_OPENQRY	_IOR('v', 1, int)
@@ -78,6 +78,3 @@ struct pcvtid {
 	int rmajor;			/* revision number, major	*/
 	int rminor;			/* revision number, minor	*/
 };
-
-/* syscons compatibility */
-#define CONS_GETVERS	_IOR('c', 74, int)