From 8f523d1cfd67a53f8761305c69f21ebdd7dc0994 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sun, 3 Dec 2017 01:13:43 +0800 Subject: [PATCH] syscons: Unbreak compile w/o splash --- sys/dev/misc/syscons/syscons.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c index 77f60f7459..bd4bf88938 100644 --- a/sys/dev/misc/syscons/syscons.c +++ b/sys/dev/misc/syscons/syscons.c @@ -2651,23 +2651,6 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode) /* NOTREACHED */ } -void -sc_start_scrn_saver(sc_softc_t *sc) -{ -#if NSPLASH > 0 - (*current_saver)(sc, TRUE); -#endif -} - -void -sc_stop_scrn_saver(sc_softc_t *sc) -{ -#if NSPLASH > 0 - if (sc->flags & SC_SCRN_BLANKED) - stop_scrn_saver(sc, current_saver); -#endif -} - static void stop_scrn_saver(sc_softc_t *sc, void (*saver)(sc_softc_t *, int)) { @@ -2713,6 +2696,23 @@ wait_scrn_saver_stop(sc_softc_t *sc, int need_unlock) #endif /* NSPLASH */ void +sc_start_scrn_saver(sc_softc_t *sc) +{ +#if NSPLASH > 0 + (*current_saver)(sc, TRUE); +#endif +} + +void +sc_stop_scrn_saver(sc_softc_t *sc) +{ +#if NSPLASH > 0 + if (sc->flags & SC_SCRN_BLANKED) + stop_scrn_saver(sc, current_saver); +#endif +} + +void sc_touch_scrn_saver(void) { scsplash_stick(FALSE); -- 2.11.4.GIT