summaryrefslogtreecommitdiff
path: root/sys/dev/wscons/wsdisplay.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2013-11-04 05:45:05 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2013-11-04 05:45:05 +0000
commitd9e877854b27a1ecb8c767cfa2ee2d7c4754f0f2 (patch)
treec91aa0ecbd95abf9c8996ba8f11ba6d29857f48d /sys/dev/wscons/wsdisplay.c
parent4b2808fd59815eabf5e2376e4abf132e281be657 (diff)
Better defaults for the screen burner settings: all unblank actions enabled,
but burning still disabled by default. Setting display.screen_off to a nonzero value with wsconsctl will be enough to enable screen blanking after the given time.
Diffstat (limited to 'sys/dev/wscons/wsdisplay.c')
-rw-r--r--sys/dev/wscons/wsdisplay.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 0eb6c07260b..0b5a5824f1a 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.116 2013/10/20 21:24:01 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.117 2013/11/04 05:45:04 miod Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -768,8 +768,9 @@ wsdisplay_common_attach(struct wsdisplay_softc *sc, int console, int kbdmux,
#ifdef HAVE_BURNER_SUPPORT
sc->sc_burnoutintvl = (hz * WSDISPLAY_DEFBURNOUT) / 1000;
- sc->sc_burninintvl = (hz * WSDISPLAY_DEFBURNIN ) / 1000;
- sc->sc_burnflags = 0; /* off by default */
+ sc->sc_burninintvl = (hz * WSDISPLAY_DEFBURNIN) / 1000;
+ sc->sc_burnflags = WSDISPLAY_BURN_OUTPUT | WSDISPLAY_BURN_KBD |
+ WSDISPLAY_BURN_MOUSE;
timeout_set(&sc->sc_burner, wsdisplay_burner, sc);
sc->sc_burnout = sc->sc_burnoutintvl;
wsdisplay_burn(sc, sc->sc_burnflags);