summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>1998-04-17 00:17:27 +0000
committerthorpej <thorpej@NetBSD.org>1998-04-17 00:17:27 +0000
commit085787ddbee6602215d140babda8eda7abae56cb (patch)
tree5db90972f8c3d5afbdc73ca02d3c8ff80b7906d3 /sys/dev
parent6af8040a5c979d951d29e348116938d5b8b9c190 (diff)
defopt the WSEMUL options.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/wscons/files.wscons4
-rw-r--r--sys/dev/wscons/wsemulconf.c6
-rw-r--r--sys/dev/wscons/wsemulvar.h6
3 files changed, 11 insertions, 5 deletions
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index 2c9500886f3..7bb2c1d2f23 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.3 1998/04/15 20:29:16 drochner Exp $
+# $NetBSD: files.wscons,v 1.4 1998/04/17 00:17:27 thorpej Exp $
#
# "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -12,6 +12,8 @@
# trouble.
#
+defopt opt_wsemul.h WSEMUL_DEFAULT WSEMUL_NO_DUMB WSEMUL_SUN
+
# this loses, but there's no way to define attributes which have attributes
device wsdisplay #tty?
attach wsdisplay at wsemuldisplaydev with wsdisplay_emul
diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c
index 3334d143f04..b4b34eca5ab 100644
--- a/sys/dev/wscons/wsemulconf.c
+++ b/sys/dev/wscons/wsemulconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemulconf.c,v 1.1 1998/03/22 14:24:03 drochner Exp $ */
+/* $NetBSD: wsemulconf.c,v 1.2 1998/04/17 00:17:27 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -33,13 +33,13 @@
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
- "$NetBSD: wsemulconf.c,v 1.1 1998/03/22 14:24:03 drochner Exp $";
+ "$NetBSD: wsemulconf.c,v 1.2 1998/04/17 00:17:27 thorpej Exp $";
#include <sys/param.h>
#include <sys/systm.h>
#include <dev/wscons/wsdisplayvar.h>
-#include <dev/wscons/wsemulvar.h>
+#include <dev/wscons/wsemulvar.h> /* pulls in opt_wsemul.h */
#include <dev/wscons/wscons_callbacks.h>
static const struct wsemul_ops *wsemul_conf[] = {
diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h
index 550178d7868..bc6eb1aa5f3 100644
--- a/sys/dev/wscons/wsemulvar.h
+++ b/sys/dev/wscons/wsemulvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemulvar.h,v 1.1 1998/03/22 14:24:03 drochner Exp $ */
+/* $NetBSD: wsemulvar.h,v 1.2 1998/04/17 00:17:27 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -43,6 +43,10 @@ struct wsemul_ops {
void (*detach) __P((void *cookie, u_int *crow, u_int *ccol));
};
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_wsemul.h"
+#endif
+
#ifndef WSEMUL_NO_DUMB
extern const struct wsemul_ops wsemul_dumb_ops;
#endif