diff options
| author | yokota <yokota@FreeBSD.org> | 1999-01-13 01:14:26 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 1999-01-13 01:14:26 +0000 |
| commit | 9f05b9a9a937f7b251424131c8bef07faebcaf95 (patch) | |
| tree | 5f68edc82323de35d811714bccba4c28ce266eb2 /sys/dev/syscons/syscons.c | |
| parent | 7fa15f53015e69b3e65c07cc8624430fc775eeb6 (diff) | |
| download | FreeBSD-src-9f05b9a9a937f7b251424131c8bef07faebcaf95.zip FreeBSD-src-9f05b9a9a937f7b251424131c8bef07faebcaf95.tar.gz | |
Get conditional compilation right so that unnecessary reference
to splash-relatec call won't be made if there is no splash pseudo
device.
Diffstat (limited to 'sys/dev/syscons/syscons.c')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 57672bc..9e5d231 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.289 1999/01/07 14:14:22 yokota Exp $ + * $Id: syscons.c,v 1.290 1999/01/11 03:18:27 yokota Exp $ */ #include "sc.h" @@ -268,12 +268,21 @@ static void sc_bcopy(scr_stat *scp, u_short *p, int from, int to, int mark); static int get_scr_num(void); static timeout_t scrn_timer; static void scrn_update(scr_stat *scp, int show_cursor); +#if NSPLASH > 0 +static int scsplash_callback(int); +static void scsplash_saver(int show); static int add_scrn_saver(void (*this_saver)(int)); static int remove_scrn_saver(void (*this_saver)(int)); static int set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border); static int restore_scrn_saver_mode(scr_stat *scp); static void stop_scrn_saver(void (*saver)(int)); static int wait_scrn_saver_stop(void); +#define scsplash_stick(stick) (sticky_splash = (stick)) +#else /* !NSPLASH */ +#define stop_scrn_saver(saver) +#define wait_scrn_saver_stop() 0 +#define scsplash_stick(stick) +#endif /* NSPLASH */ static int switch_scr(scr_stat *scp, u_int next_scr); static void exchange_scr(void); static void scan_esc(scr_stat *scp, u_char c); @@ -305,13 +314,6 @@ static void draw_cutmarking(scr_stat *scp); static void remove_cutmarking(scr_stat *scp); static void do_bell(scr_stat *scp, int pitch, int duration); static timeout_t blink_screen; -#if NSPLASH > 0 -static int scsplash_callback(int); -static void scsplash_saver(int show); -#define scsplash_stick(stick) (sticky_splash = (stick)) -#else -#define scsplash_stick(stick) -#endif /* NSPLASH */ static cn_probe_t sccnprobe; static cn_init_t sccninit; |
