[src/netbsd-1-4]: src/sys/dev/wscons Pull up revision 1.31 (requested by mycr...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ff582aba663
branches:  netbsd-1-4
changeset: 469605:7ff582aba663
user:      he <he%NetBSD.org@localhost>
date:      Tue Oct 19 16:39:20 1999 +0000

description:
Pull up revision 1.31 (requested by mycroft):
  Enable VT-switching ioctls on ttyEcfg, which allows Linux X servers
  to work when properly configured (with symlink /emul/linux/dev/tty0
  -> /dev/ttyEcfg).

diffstat:

 sys/dev/wscons/wsdisplay.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r dce1da7a077c -r 7ff582aba663 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Tue Oct 19 16:34:04 1999 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Tue Oct 19 16:39:20 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.22 1999/03/23 15:56:56 drochner Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.22.2.1 1999/10/19 16:39:20 he Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -33,7 +33,7 @@
 static const char _copyright[] __attribute__ ((unused)) =
     "Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.";
 static const char _rcsid[] __attribute__ ((unused)) =
-    "$NetBSD: wsdisplay.c,v 1.22 1999/03/23 15:56:56 drochner Exp $";
+    "$NetBSD: wsdisplay.c,v 1.22.2.1 1999/10/19 16:39:20 he Exp $";
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -872,6 +872,12 @@
        unit = WSDISPLAYUNIT(dev);
        sc = wsdisplay_cd.cd_devs[unit];
 
+#ifdef WSDISPLAY_COMPAT_USL
+       error = wsdisplay_usl_ioctl1(sc, cmd, data, flag, p);
+       if (error >= 0)
+               return (error);
+#endif
+
        if (ISWSDISPLAYCTL(dev))
                return (wsdisplay_cfg_ioctl(sc, cmd, data, flag, p));
 
@@ -894,7 +900,7 @@
        }
 
 #ifdef WSDISPLAY_COMPAT_USL
-       error = wsdisplay_usl_ioctl(sc, scr, cmd, data, flag, p);
+       error = wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p);
        if (error >= 0)
                return (error);
 #endif