[src/netbsd-2-0]: src/sys/dev/wscons Pull up revision 1.78 (requested by rech...

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

details:   https://anonhg.NetBSD.org/src/rev/6fa87cd15b80
branches:  netbsd-2-0
changeset: 561317:6fa87cd15b80
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 07 09:57:37 2004 +0000

description:
Pull up revision 1.78 (requested by recht in ticket #451):
return ENODEV if functions are not compiled in the kernel.

diffstat:

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

diffs (41 lines):

diff -r 4f0b2978511a -r 6fa87cd15b80 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Mon Jun 07 09:57:29 2004 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Mon Jun 07 09:57:37 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.76.2.1 2004/06/07 09:38:12 tron Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.76.2.2 2004/06/07 09:57:37 tron Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.76.2.1 2004/06/07 09:38:12 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.76.2.2 2004/06/07 09:57:37 tron Exp $");
 
 #include "opt_wsdisplay_compat.h"
 #include "opt_compat_netbsd.h"
@@ -1095,6 +1095,10 @@
                ksdp = &sc->sc_scroll_values;
                SETSCROLLLINES(usdp, ksdp, ksdp);
                return (0);
+#else
+       case WSDISPLAYIO_DSSCROLL:
+       case WSDISPLAYIO_DGSCROLL:
+               return ENODEV;
 #endif
 
        case WSDISPLAYIO_SFONT:
@@ -1133,7 +1137,10 @@
                return ((*sc->sc_accessops->putwschar)
                        (scr->scr_dconf->emulcookie, d));
 #undef d
-               return 1;
+#else
+       case WSDISPLAYIO_PUTWSCHAR:
+       case WSDISPLAYIO_GETWSCHAR:
+               return ENODEV;
 #endif /* WSDISPLAY_CHARFUNCS */
 
        }