summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/wscons/wsdisplay.c7
-rw-r--r--sys/dev/wscons/wsdisplayvar.h4
2 files changed, 6 insertions, 5 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);
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 35d719b6ee5..57c8db26776 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplayvar.h,v 1.28 2013/10/20 21:24:01 miod Exp $ */
+/* $OpenBSD: wsdisplayvar.h,v 1.29 2013/11/04 05:45:04 miod Exp $ */
/* $NetBSD: wsdisplayvar.h,v 1.30 2005/02/04 02:10:49 perry Exp $ */
/*
@@ -247,6 +247,6 @@ void wsscrollback(void *v, int op);
/*
* screen burner
*/
-#define WSDISPLAY_DEFBURNOUT 600000 /* ms */
+#define WSDISPLAY_DEFBURNOUT 0 /* disabled */
#define WSDISPLAY_DEFBURNIN 250 /* ms */