From 17053a685a863db1e3b3e04e17128ec23d3b3240 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 30 Jun 1998 20:51:13 +0000 Subject: In pccngetc, check that dev is not NODEV [NetBSD] Disallow KDENABIO icotl if securelevel > 1 [NetBSD] Only define scrnsv_timeout if PCVT_SCREENSAVER set [NetBSD] Fix setting of keyboard LED's. For some keyboard controllers the keyboard would hang when pcvt set the LED because pcvt did not wait for the ACK to come back. [FreeBSD] Consolidate keyboard type checks into a switch statement. [me] --- sys/arch/i386/isa/pcvt/pcvt_hdr.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'sys/arch/i386/isa/pcvt/pcvt_hdr.h') diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h index 8f8a118f477..3fabcc4428a 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_hdr.h,v 1.19 1998/06/25 00:40:28 millert Exp $ */ +/* $OpenBSD: pcvt_hdr.h,v 1.20 1998/06/30 20:51:11 millert Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -862,11 +862,8 @@ int switch_page = -1; /* which page to switch to */ #if PCVT_SCREENSAVER u_char reset_screen_saver = 1; /* reset the saver next time */ u_char scrnsv_active = 0; /* active flag */ -#endif /* PCVT_SCREENSAVER */ - -#if XSERVER || PCVT_SCREENSAVER unsigned scrnsv_timeout = 0; /* initially off */ -#endif /* XSERVER || PCVT_SCREENSAVER */ +#endif /* PCVT_SCREENSAVER */ #if PCVT_BACKUP_FONTS u_char *saved_charsets[NVGAFONTS] = {0}; /* backup copy of fonts */ @@ -999,9 +996,9 @@ extern u_char sgr_tab_color[]; extern u_char sgr_tab_mono[]; extern u_char sgr_tab_imono[]; -#if defined(XSERVER) || PCVT_SCREENSAVER +#if PCVT_SCREENSAVER extern unsigned scrnsv_timeout; -#endif /* XSERVER || PCVT_SCREENSAVER */ +#endif /* PCVT_SCREENSAVER */ #if PCVT_BACKUP_FONTS extern u_char *saved_charsets[NVGAFONTS]; -- cgit v1.2.3