[src/trunk]: src/sys/dev/wscons return ENODEV if functions are not compiled i...

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

details:   https://anonhg.NetBSD.org/src/rev/9e6e7cb476fa
branches:  trunk
changeset: 567174:9e6e7cb476fa
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 03 19:04:58 2004 +0000

description:
return ENODEV if functions are not compiled in the kernel.

diffstat:

 sys/dev/wscons/wsdisplay.c |  13 ++++++++++---
 sys/dev/wscons/wskbd.c     |   8 ++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diffs (70 lines):

diff -r b53e61a05a24 -r 9e6e7cb476fa sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Thu Jun 03 18:37:59 2004 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Thu Jun 03 19:04:58 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.77 2004/05/28 21:42:29 christos Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.78 2004/06/03 19:04:58 christos 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.77 2004/05/28 21:42:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.78 2004/06/03 19:04:58 christos 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 */
 
        }
diff -r b53e61a05a24 -r 9e6e7cb476fa sys/dev/wscons/wskbd.c
--- a/sys/dev/wscons/wskbd.c    Thu Jun 03 18:37:59 2004 +0000
+++ b/sys/dev/wscons/wskbd.c    Thu Jun 03 19:04:58 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.75 2004/05/29 02:01:09 christos Exp $ */
+/* $NetBSD: wskbd.c,v 1.76 2004/06/03 19:04:58 christos Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.75 2004/05/29 02:01:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.76 2004/06/03 19:04:58 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1057,6 +1057,10 @@
                ksdp = &sc->sc_scroll_data;
                SETSCROLLMOD(usdp, ksdp, ksdp);
                return (0);
+#else
+       case WSKBDIO_GETSCROLL:
+       case WSKBDIO_SETSCROLL:
+               return ENODEV;
 #endif
 
 #undef SETKEYREPEAT